diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 16:06:24 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 16:06:24 +0000 |
| commit | 441ec71580e34ddb2dd23811771191a6fe6f6f17 (patch) | |
| tree | 03cd05256d656a72d28f38990366ac69b6d22086 /chrome/browser/views/bookmark_bar_view.cc | |
| parent | a8ad46902facb0bbacb80deb5dbae9af15f48f2e (diff) | |
| download | chromium_src-441ec71580e34ddb2dd23811771191a6fe6f6f17.zip chromium_src-441ec71580e34ddb2dd23811771191a6fe6f6f17.tar.gz chromium_src-441ec71580e34ddb2dd23811771191a6fe6f6f17.tar.bz2 | |
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/2135011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
| -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); |