diff -ruw ../src/chrome/browser/autocomplete/search_provider.cc browser/autocomplete/search_provider.cc --- ../src/chrome/browser/autocomplete/search_provider.cc 2009-12-17 18:54:19.685148473 -0700 +++ browser/autocomplete/search_provider.cc 2009-08-07 05:34:13.000000000 -0700 @@ -225,10 +225,10 @@ // likely to end up throwing away anyway. static const int kQueryDelayMs = 200; - if (!IsQuerySuitableForSuggest()) { +// if (!IsQuerySuitableForSuggest()) { StopSuggest(); return; - } +// } // For the minimal_changes case, if we finished the previous query and still // have its results, or are allowed to keep running it, just do that, rather diff -ruw ../src/chrome/browser/first_run.cc browser/first_run.cc --- ../src/chrome/browser/first_run.cc 2009-12-17 18:54:20.445668036 -0700 +++ browser/first_run.cc 2009-08-04 15:23:41.000000000 -0700 @@ -61,7 +61,7 @@ #if !defined(OS_MACOSX) bool FirstRun::IsChromeFirstRun() { // A troolean, 0 means not yet set, 1 means set to true, 2 set to false. - static int first_run = 0; + /* static int first_run = 0; if (first_run != 0) return first_run == 1; @@ -71,8 +71,8 @@ first_run = 2; return false; } - first_run = 1; - return true; + first_run = 1;*/ + return false; } #endif diff -ruw ../src/chrome/browser/google_url_tracker.cc browser/google_url_tracker.cc --- ../src/chrome/browser/google_url_tracker.cc 2009-10-14 16:23:43.905830473 -0700 +++ browser/google_url_tracker.cc 2009-08-01 06:06:14.000000000 -0700 @@ -35,9 +35,9 @@ // browser is starting up, and if so, come back later", but there is currently // no function to do this. static const int kStartFetchDelayMS = 5000; - MessageLoop::current()->PostDelayedTask(FROM_HERE, + /* MessageLoop::current()->PostDelayedTask(FROM_HERE, fetcher_factory_.NewRunnableMethod(&GoogleURLTracker::FinishSleep), - kStartFetchDelayMS); + kStartFetchDelayMS);*/ } GoogleURLTracker::~GoogleURLTracker() { diff -ruw ../src/chrome/browser/metrics/metrics_service.cc browser/metrics/metrics_service.cc --- ../src/chrome/browser/metrics/metrics_service.cc 2009-12-17 18:54:21.734631019 -0700 +++ browser/metrics/metrics_service.cc 2009-08-04 12:33:56.000000000 -0700 @@ -426,8 +426,8 @@ } void MetricsService::Start() { - SetRecording(true); - SetReporting(true); + SetRecording(false); + SetReporting(false); } void MetricsService::StartRecordingOnly() { @@ -443,6 +443,8 @@ void MetricsService::SetRecording(bool enabled) { DCHECK(IsSingleThreaded()); +enabled=false; + if (enabled == recording_active_) return; @@ -453,11 +455,12 @@ client_id_ = WideToUTF8(pref->GetString(prefs::kMetricsClientID)); if (client_id_.empty()) { client_id_ = GenerateClientID(); - pref->SetString(prefs::kMetricsClientID, UTF8ToWide(client_id_)); - +// pref->SetString(prefs::kMetricsClientID, UTF8ToWide(client_id_)); + pref->SetString(prefs::kMetricsClientID, UTF8ToWide("")); // Might as well make a note of how long this ID has existed pref->SetString(prefs::kMetricsClientIDTimestamp, - Int64ToWString(Time::Now().ToTimeT())); + // Int64ToWString(Time::Now().ToTimeT())); + Int64ToWString(0)); } } StartRecording(); diff -ruw ../src/chrome/browser/tab_contents/tab_contents.cc browser/tab_contents/tab_contents.cc --- ../src/chrome/browser/tab_contents/tab_contents.cc 2009-12-17 18:54:23.084639469 -0700 +++ browser/tab_contents/tab_contents.cc 2009-08-07 12:58:34.000000000 -0700 @@ -2192,10 +2192,10 @@ PrefService* prefs = profile()->GetPrefs(); DCHECK(prefs); - if (prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)) { + /* if (prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)) { url = google_util::AppendGoogleLocaleParam(GURL(kLinkDoctorBaseURL)); url = google_util::AppendGoogleTLDParam(url); - } + } }*/ return url; } diff -ruw ../src/chrome/browser/views/options/advanced_contents_view.cc browser/views/options/advanced_contents_view.cc --- ../src/chrome/browser/views/options/advanced_contents_view.cc 2009-12-17 18:54:23.380513386 -0700 +++ browser/views/options/advanced_contents_view.cc 2009-08-04 15:10:21.000000000 -0700 @@ -488,12 +488,12 @@ private: // Controls for this section: views::Label* section_description_label_; - views::Checkbox* enable_link_doctor_checkbox_; - views::Checkbox* enable_suggest_checkbox_; +// views::Checkbox* enable_link_doctor_checkbox_; +// views::Checkbox* enable_suggest_checkbox_; views::Checkbox* enable_dns_prefetching_checkbox_; views::Checkbox* enable_safe_browsing_checkbox_; - views::Checkbox* reporting_enabled_checkbox_; - views::Link* learn_more_link_; +// views::Checkbox* reporting_enabled_checkbox_; +// views::Link* learn_more_link_; views::Label* cookie_behavior_label_; views::Combobox* cookie_behavior_combobox_; views::NativeButton* show_cookies_button_; @@ -516,12 +516,12 @@ PrivacySection::PrivacySection(Profile* profile) : section_description_label_(NULL), - enable_link_doctor_checkbox_(NULL), - enable_suggest_checkbox_(NULL), +// enable_link_doctor_checkbox_(NULL), + // enable_suggest_checkbox_(NULL), enable_dns_prefetching_checkbox_(NULL), enable_safe_browsing_checkbox_(NULL), - reporting_enabled_checkbox_(NULL), - learn_more_link_(NULL), +// reporting_enabled_checkbox_(NULL), + // learn_more_link_(NULL), cookie_behavior_label_(NULL), cookie_behavior_combobox_(NULL), show_cookies_button_(NULL), @@ -530,7 +530,7 @@ } void PrivacySection::ButtonPressed(views::Button* sender) { - if (sender == enable_link_doctor_checkbox_) { +/* if (sender == enable_link_doctor_checkbox_) { bool enabled = enable_link_doctor_checkbox_->checked(); UserMetricsRecordAction(enabled ? L"Options_LinkDoctorCheckbox_Enable" : @@ -544,7 +544,7 @@ L"Options_UseSuggestCheckbox_Disable", profile()->GetPrefs()); use_suggest_.SetValue(enabled); - } else if (sender == enable_dns_prefetching_checkbox_) { + } else */if (sender == enable_dns_prefetching_checkbox_) { bool enabled = enable_dns_prefetching_checkbox_->checked(); UserMetricsRecordAction(enabled ? L"Options_DnsPrefetchCheckbox_Enable" : @@ -563,7 +563,7 @@ g_browser_process->resource_dispatcher_host()->safe_browsing_service(); MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod( safe_browsing_service, &SafeBrowsingService::OnEnable, enabled)); - } else if (sender == reporting_enabled_checkbox_) { +/* } else if (sender == reporting_enabled_checkbox_) { bool enabled = reporting_enabled_checkbox_->checked(); UserMetricsRecordAction(enabled ? L"Options_MetricsReportingCheckbox_Enable" : @@ -573,20 +573,20 @@ if (enabled == reporting_enabled_checkbox_->checked()) RestartMessageBox::ShowMessageBox(GetWindow()->GetNativeWindow()); enable_metrics_recording_.SetValue(enabled); - } else if (sender == show_cookies_button_) { + */ } else if (sender == show_cookies_button_) { UserMetricsRecordAction(L"Options_ShowCookies", NULL); CookiesView::ShowCookiesWindow(profile()); } } void PrivacySection::LinkActivated(views::Link* source, int event_flags) { - if (source == learn_more_link_) { +/* if (source == learn_more_link_) { // We open a new browser window so the Options dialog doesn't get lost // behind other windows. Browser* browser = Browser::Create(profile()); browser->OpenURL(GURL(l10n_util::GetString(IDS_LEARN_MORE_PRIVACY_URL)), GURL(), NEW_WINDOW, PageTransition::LINK); - } + }*/ } void PrivacySection::Layout() { @@ -598,7 +598,7 @@ views::View* parent = GetParent(); if (parent && parent->width()) { const int parent_width = parent->width(); - reporting_enabled_checkbox_->SetBounds(0, 0, parent_width - 20, 0); +// reporting_enabled_checkbox_->SetBounds(0, 0, parent_width - 20, 0); } View::Layout(); } @@ -625,29 +625,29 @@ section_description_label_ = new views::Label( l10n_util::GetString(IDS_OPTIONS_DISABLE_SERVICES)); - enable_link_doctor_checkbox_ = new views::Checkbox( +/* enable_link_doctor_checkbox_ = new views::Checkbox( l10n_util::GetString(IDS_OPTIONS_LINKDOCTOR_PREF)); enable_link_doctor_checkbox_->set_listener(this); enable_suggest_checkbox_ = new views::Checkbox( l10n_util::GetString(IDS_OPTIONS_SUGGEST_PREF)); - enable_suggest_checkbox_->set_listener(this); + enable_suggest_checkbox_->set_listener(this);*/ enable_dns_prefetching_checkbox_ = new views::Checkbox( l10n_util::GetString(IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION)); enable_dns_prefetching_checkbox_->set_listener(this); enable_safe_browsing_checkbox_ = new views::Checkbox( l10n_util::GetString(IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION)); enable_safe_browsing_checkbox_->set_listener(this); - reporting_enabled_checkbox_ = new views::Checkbox( +/* reporting_enabled_checkbox_ = new views::Checkbox( l10n_util::GetString(IDS_OPTIONS_ENABLE_LOGGING)); reporting_enabled_checkbox_->SetMultiLine(true); - reporting_enabled_checkbox_->set_listener(this); + reporting_enabled_checkbox_->set_listener(this);*/ #if defined(GOOGLE_CHROME_BUILD) - reporting_enabled_checkbox_->SetVisible(true); +// reporting_enabled_checkbox_->SetVisible(true); #else - reporting_enabled_checkbox_->SetVisible(false); +// reporting_enabled_checkbox_->SetVisible(false); #endif - learn_more_link_ = new views::Link(l10n_util::GetString(IDS_LEARN_MORE)); - learn_more_link_->SetController(this); + //learn_more_link_ = new views::Link(l10n_util::GetString(IDS_LEARN_MORE)); + //learn_more_link_->SetController(this); cookie_behavior_label_ = new views::Label( l10n_util::GetString(IDS_OPTIONS_COOKIES_ACCEPT_LABEL)); allow_cookies_model_.reset(new CookieBehaviorComboModel); @@ -674,15 +674,15 @@ AddWrappingLabelRow(layout, section_description_label_, single_column_view_set_id, true); // Learn more link. - AddLeadingControl(layout, learn_more_link_, - single_column_view_set_id, false); +// AddLeadingControl(layout, learn_more_link_, + // single_column_view_set_id, false); // Link doctor. - AddWrappingCheckboxRow(layout, enable_link_doctor_checkbox_, - single_column_view_set_id, false); +// AddWrappingCheckboxRow(layout, enable_link_doctor_checkbox_, + // single_column_view_set_id, false); // Use Suggest service. - AddWrappingCheckboxRow(layout, enable_suggest_checkbox_, - single_column_view_set_id, false); + //AddWrappingCheckboxRow(layout, enable_suggest_checkbox_, + // single_column_view_set_id, false); // DNS pre-fetching. AddWrappingCheckboxRow(layout, enable_dns_prefetching_checkbox_, single_column_view_set_id, false); @@ -690,8 +690,8 @@ AddWrappingCheckboxRow(layout, enable_safe_browsing_checkbox_, single_column_view_set_id, false); // The "Help make Google Chrome better" checkbox. - AddLeadingControl(layout, reporting_enabled_checkbox_, - single_column_view_set_id, false); +// AddLeadingControl(layout, reporting_enabled_checkbox_, + // single_column_view_set_id, false); // Cookies. AddWrappingLabelRow(layout, cookie_behavior_label_, single_column_view_set_id, true); @@ -714,13 +714,13 @@ } void PrivacySection::NotifyPrefChanged(const std::wstring* pref_name) { - if (!pref_name || *pref_name == prefs::kAlternateErrorPagesEnabled) { +/* if (!pref_name || *pref_name == prefs::kAlternateErrorPagesEnabled) { enable_link_doctor_checkbox_->SetChecked( alternate_error_pages_.GetValue()); } if (!pref_name || *pref_name == prefs::kSearchSuggestEnabled) { enable_suggest_checkbox_->SetChecked(use_suggest_.GetValue()); - } + }*/ if (!pref_name || *pref_name == prefs::kDnsPrefetchingEnabled) { bool enabled = dns_prefetch_enabled_.GetValue(); enable_dns_prefetching_checkbox_->SetChecked(enabled); @@ -728,11 +728,11 @@ } if (!pref_name || *pref_name == prefs::kSafeBrowsingEnabled) enable_safe_browsing_checkbox_->SetChecked(safe_browsing_.GetValue()); - if (!pref_name || *pref_name == prefs::kMetricsReportingEnabled) { +/* if (!pref_name || *pref_name == prefs::kMetricsReportingEnabled) { reporting_enabled_checkbox_->SetChecked( enable_metrics_recording_.GetValue()); ResolveMetricsReportingEnabled(); - } + }*/ if (!pref_name || *pref_name == prefs::kCookieBehavior) { cookie_behavior_combobox_->SetSelectedItem( CookieBehaviorComboModel::CookiePolicyToIndex( @@ -741,11 +741,11 @@ } void PrivacySection::ResolveMetricsReportingEnabled() { - bool enabled = reporting_enabled_checkbox_->checked(); + /*bool enabled = reporting_enabled_checkbox_->checked(); enabled = OptionsUtil::ResolveMetricsReportingEnabled(enabled); - reporting_enabled_checkbox_->SetChecked(enabled); + reporting_enabled_checkbox_->SetChecked(enabled);*/ } ////////////////////////////////////////////////////////////////////////////////