summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 17:08:03 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 17:08:03 +0000
commita7128fa0a1d669745883964e69ff35084ac223ff (patch)
tree93e34fa8140821c6d71c0efc52ef926def483dc2 /chrome/common
parentdcfd2ec3e43257fe7ec3b6e07faec300aeeda510 (diff)
downloadchromium_src-a7128fa0a1d669745883964e69ff35084ac223ff.zip
chromium_src-a7128fa0a1d669745883964e69ff35084ac223ff.tar.gz
chromium_src-a7128fa0a1d669745883964e69ff35084ac223ff.tar.bz2
Win IO Perf Regressions
http://build.chromium.org/buildbot/perf/xp-release-dual-core/moz/report.html?history=150&rev=-1&graph=total_byte_b Revert 56483 - Monitor network change in GoogleURLTracker BUG=48688,15141 TEST=GoogleURLTrackerTest.MonitorNetworkChange passes Review URL: http://codereview.chromium.org/3034018 TBR=ukai@chromium.org Review URL: http://codereview.chromium.org/3176017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/net/url_fetcher_protect.h7
-rw-r--r--chrome/common/pref_names.cc6
-rw-r--r--chrome/common/pref_names.h1
3 files changed, 1 insertions, 13 deletions
diff --git a/chrome/common/net/url_fetcher_protect.h b/chrome/common/net/url_fetcher_protect.h
index 980353c..95ecf97 100644
--- a/chrome/common/net/url_fetcher_protect.h
+++ b/chrome/common/net/url_fetcher_protect.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -61,11 +61,6 @@ class URLFetcherProtectEntry {
return max_retries_;
}
- // Sets the max retries.
- void SetMaxRetries(int max_retries) {
- max_retries_ = max_retries;
- }
-
private:
// When a request comes, calculate the release time for it.
// Returns the backoff time before sending.
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 75086de..40183d1 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -763,12 +763,6 @@ const char kShouldShowWelcomePage[] = "show-welcome-page";
// correct Google domain/country code for whatever location the user is in.
const char kLastKnownGoogleURL[] = "browser.last_known_google_url";
-// String containing the last prompted Google URL to the user.
-// If the user is using .x TLD for Google URL and gets prompted about .y TLD
-// for Google URL, and says "no", we should leave the search engine set to .x
-// but not prompt again until the domain changes away from .y.
-const char kLastPromptedGoogleURL[] = "browser.last_prompted_google_url";
-
// String containing the last known intranet redirect URL, if any. See
// intranet_redirect_detector.h for more information.
const char kLastKnownIntranetRedirectOrigin[] = "";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 45e9c74..f27005a 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -277,7 +277,6 @@ extern const char kShouldUseMinimalFirstRunBubble[];
extern const char kShouldShowWelcomePage[];
extern const char kLastKnownGoogleURL[];
-extern const char kLastPromptedGoogleURL[];
extern const char kLastKnownIntranetRedirectOrigin[];
extern const char kCountryIDAtInstall[];