diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-22 23:37:22 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-22 23:37:22 +0000 |
| commit | da17b37430e97d518b7d640b98831c8e338b478c (patch) | |
| tree | 65a777269f439c2b00b79d6f0e5c7ba140114461 /chrome/browser/browser.cc | |
| parent | a47fb6d0f441c34379c294f68cf8b2501cb36348 (diff) | |
| download | chromium_src-da17b37430e97d518b7d640b98831c8e338b478c.zip chromium_src-da17b37430e97d518b7d640b98831c8e338b478c.tar.gz chromium_src-da17b37430e97d518b7d640b98831c8e338b478c.tar.bz2 | |
3rd step to remove BrowserExtender and to refactor BrowerView for sidebar.
* defined UIStyle enum
* fixed #if for compact navbar so that it's enabled only on chromeos
* Moved view initialization and layouts code from NormalExtender to chromeosBrowserView and ChromeosBrowsrViewLayoutManager respectively.
* Removed unnecessary extender code from BrowserView.
* no functional change
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/553059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 3259fd6..fa5b781 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -988,7 +988,7 @@ void Browser::ToggleFullscreenMode() { #endif } -#if defined(TOOLKIT_VIEWS) +#if defined(OS_CHROMEOS) void Browser::ToggleCompactNavigationBar() { UserMetrics::RecordAction("ToggleCompactNavigationBar", profile_); window_->ToggleCompactNavigationBar(); @@ -1496,7 +1496,7 @@ void Browser::ExecuteCommandWithDisposition( case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break; case IDC_FULLSCREEN: ToggleFullscreenMode(); break; case IDC_EXIT: Exit(); break; -#if defined(TOOLKIT_VIEWS) +#if defined(OS_CHROMEOS) case IDC_COMPACT_NAVBAR: ToggleCompactNavigationBar(); break; #endif @@ -2496,7 +2496,7 @@ void Browser::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_FULLSCREEN, true); #endif command_updater_.UpdateCommandEnabled(IDC_EXIT, true); -#if defined(TOOLKIT_VIEWS) +#if defined(OS_CHROMEOS) command_updater_.UpdateCommandEnabled(IDC_COMPACT_NAVBAR, true); #endif |