summaryrefslogtreecommitdiffstats
path: root/chrome/browser/defaults.h
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 22:43:43 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 22:43:43 +0000
commita965ca65e8170b3d685b7ca9185929fe3915b7f9 (patch)
tree0b4020409e9c79163bcd8e7bc6f35e624d4b4951 /chrome/browser/defaults.h
parent5287c9bb1153016b2eff85fbcf7c06361bf72898 (diff)
downloadchromium_src-a965ca65e8170b3d685b7ca9185929fe3915b7f9.zip
chromium_src-a965ca65e8170b3d685b7ca9185929fe3915b7f9.tar.gz
chromium_src-a965ca65e8170b3d685b7ca9185929fe3915b7f9.tar.bz2
Revert 81158 due to memory bots - a Downloaded or retrieved favicon and touch in FaviconHelper.b.ViewHostMsg_UpdateFaviconURL can update multiple icon urlsBUG=71571TEST=Tested with existing unit test and add 2 new unit testsReview URL: http://codereview.chromium.org/6672065
TBR=michaelbai@google.com Review URL: http://codereview.chromium.org/6820054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/defaults.h')
-rw-r--r--chrome/browser/defaults.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index e733675..dd06dbe 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -68,9 +68,6 @@ extern const bool kAlwaysOpenIncognitoWindow;
// Should the close button be shown in the Task Manager dialog?
extern const bool kShowCancelButtonInTaskManager;
-// Are touch icons enabled? False by default.
-extern const bool kEnableTouchIcon;
-
//=============================================================================
// Runtime "const" - set only once after parsing command line option and should
// never be modified after that.