diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 15:56:26 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 15:56:26 +0000 |
| commit | 596c6aa19c34c9c912aa095078231a02ffbd8812 (patch) | |
| tree | 7164ddc5ef8a06181225867b27754e10a21444be /chrome/browser/views | |
| parent | 1cf7ff9b69d4b80fe42182e018d26df3e49fe775 (diff) | |
| download | chromium_src-596c6aa19c34c9c912aa095078231a02ffbd8812.zip chromium_src-596c6aa19c34c9c912aa095078231a02ffbd8812.tar.gz chromium_src-596c6aa19c34c9c912aa095078231a02ffbd8812.tar.bz2 | |
Relanding 48042.
I reverted http://codereview.chromium.org/1986006 as part of that change, after talking with Ben and Aaron. (it breaks the UI tests on ChromeOS now that apps are enabled).
Disabling app launcher and enabling apps by default on ChromeOS .
BUG=3218
TEST=Open the new tab, the new new tab should be shown. Any installed
app should be showing in there.
Review URL: http://codereview.chromium.org/2149003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 8ff3c42..56f2f79 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -33,7 +33,6 @@ #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/location_bar/location_bar_view.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" @@ -461,10 +460,8 @@ void BookmarkBarView::SetPageNavigator(PageNavigator* navigator) { gfx::Size BookmarkBarView::GetPreferredSize() { // We don't want the bookmark bar view in the app launcher new tab page. - static bool extension_apps = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableApps); - bool hide_bookmark_bar = (extension_apps && OnNewTabPage()) || - OnAppsPage(); + bool hide_bookmark_bar = + (Extension::AppsAreEnabled() && OnNewTabPage()) || OnAppsPage(); if (!hide_bookmark_bar) return LayoutItems(true); |