diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:57:41 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:57:41 +0000 |
| commit | 04797250b8e2c836b5701390e1443ac45aa4208a (patch) | |
| tree | 350d605e595f4d21443a08bb9082d4a2d881aef9 /chrome/browser/defaults.cc | |
| parent | 1783a583e64387a8b35a5b79e6fb6b0fee35da63 (diff) | |
| download | chromium_src-04797250b8e2c836b5701390e1443ac45aa4208a.zip chromium_src-04797250b8e2c836b5701390e1443ac45aa4208a.tar.gz chromium_src-04797250b8e2c836b5701390e1443ac45aa4208a.tar.bz2 | |
Cleanup: Remove some code that only exists under mutually exclusive #defines.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9836020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/defaults.cc')
| -rw-r--r-- | chrome/browser/defaults.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc index 2be9c42..7111744 100644 --- a/chrome/browser/defaults.cc +++ b/chrome/browser/defaults.cc @@ -6,24 +6,18 @@ namespace browser_defaults { -#if defined(USE_AURA) || defined(OS_CHROMEOS) +#if defined(USE_AURA) const bool kOSSupportsOtherBrowsers = false; #else const bool kOSSupportsOtherBrowsers = true; #endif -#if defined(OS_CHROMEOS) && !defined(USE_AURA) || defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_USES_GTK) const bool kShowCancelButtonInTaskManager = true; #else const bool kShowCancelButtonInTaskManager = false; #endif -#if defined(OS_CHROMEOS) && !defined(USE_AURA) -const bool kShowHtmlTitleBarInTaskManager = true; -#else -const bool kShowHtmlTitleBarInTaskManager = false; -#endif - #if defined(OS_CHROMEOS) // Make the regular omnibox text two points larger than the nine-point font // used in the tab strip (11pt / 72pt/in * 96px/in = 14.667px). @@ -56,9 +50,9 @@ const int kAutocompleteEditFontPixelSizeInPopup = const bool kCanToggleSystemTitleBar = false; #else const bool kCanToggleSystemTitleBar = true; -#endif +#endif // defined(TOOLKIT_VIEWS) -#endif +#endif // defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS) |