diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 21:44:19 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 21:44:19 +0000 |
| commit | 4947e54e7bce89c024f0716ccd0b7b2089435103 (patch) | |
| tree | 99700b59431bf2f57ad4be7de18a638b81159999 | |
| parent | 5e0d4de52fcf0ddbcd94a56e6890af4aabf6f705 (diff) | |
| download | chromium_src-4947e54e7bce89c024f0716ccd0b7b2089435103.zip chromium_src-4947e54e7bce89c024f0716ccd0b7b2089435103.tar.gz chromium_src-4947e54e7bce89c024f0716ccd0b7b2089435103.tar.bz2 | |
ExtApps: Show the bookmark bar again on NTP (except inside the App Launcher panel).
BUG=44077
TEST=Bookmark bar should always be visible on the NTP if extension apps are disabled (default) and should be visible if attached when extension apps are enabled.
Review URL: http://codereview.chromium.org/2225004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48330 0039d316-1c4b-4281-b951-d872f2087c98
| -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 56f2f79..1846435d 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -459,11 +459,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. - bool hide_bookmark_bar = - (Extension::AppsAreEnabled() && OnNewTabPage()) || OnAppsPage(); - - if (!hide_bookmark_bar) + // Extension apps don't show the bookmark bar. + if (!OnAppsPage()) return LayoutItems(true); else return gfx::Size(); |