diff options
Diffstat (limited to 'chrome/browser/chromeos')
10 files changed, 26 insertions, 26 deletions
diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc index f403694..690956a 100644 --- a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc +++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -31,7 +31,8 @@ BrowserFrameChromeos::~BrowserFrameChromeos() { void BrowserFrameChromeos::InitBrowserFrame() { BrowserFrameGtk::InitBrowserFrame(); - if (!browser_view()->IsBrowserTypePopup()) { + if (!browser_view()->IsBrowserTypePopup() && + !browser_view()->IsBrowserTypePanel()) { // On chromeos we want windows to always render as active. DisableInactiveRendering(); } @@ -40,8 +41,9 @@ void BrowserFrameChromeos::InitBrowserFrame() { bool BrowserFrameChromeos::IsMaximized() const { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeosFrame)) return WindowGtk::IsMaximized(); - bool is_popup = browser_view()->IsBrowserTypePopup(); - return !IsFullscreen() && (!is_popup || WindowGtk::IsMaximized()); + bool is_popup_or_panel = browser_view()->IsBrowserTypePopup() || + browser_view()->IsBrowserTypePanel(); + return !IsFullscreen() && (!is_popup_or_panel || WindowGtk::IsMaximized()); } } // namespace chromeos diff --git a/chrome/browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc b/chrome/browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc index 6bfd458..2932112 100644 --- a/chrome/browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc +++ b/chrome/browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc @@ -12,7 +12,7 @@ namespace browser { BrowserNonClientFrameView* CreateBrowserNonClientFrameView( BrowserFrame* frame, BrowserView* browser_view) { - if (browser_view->IsBrowserTypePopup()) + if (browser_view->IsBrowserTypePopup() || browser_view->IsBrowserTypePanel()) return new PopupNonClientFrameView(); else return new chromeos::BrowserFrameViewChromeos(frame, browser_view); diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index dce2741..6f42dc6 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -431,7 +431,7 @@ void BrowserView::InitSystemMenu() { BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { // Create a browser view for chromeos. BrowserView* view; - if (browser->type() & Browser::TYPE_POPUP) + if (browser->is_type_popup() || browser->is_type_panel()) view = new chromeos::PanelBrowserView(browser); else view = new chromeos::BrowserView(browser); diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h index f25741d..4da430b 100644 --- a/chrome/browser/chromeos/frame/browser_view.h +++ b/chrome/browser/chromeos/frame/browser_view.h @@ -32,7 +32,7 @@ class StatusAreaView; class StatusAreaButton; // chromeos::BrowserView adds ChromeOS specific controls and menus to a -// BrowserView created with Browser::TYPE_NORMAL. This extender adds controls +// BrowserView created with Browser::TYPE_TABBED. This extender adds controls // to the title bar as follows: // ____ __ __ // / \ \ \ [StatusArea] diff --git a/chrome/browser/chromeos/frame/dom_browser.cc b/chrome/browser/chromeos/frame/dom_browser.cc index b593f89..6c9a4ff 100644 --- a/chrome/browser/chromeos/frame/dom_browser.cc +++ b/chrome/browser/chromeos/frame/dom_browser.cc @@ -12,7 +12,7 @@ namespace chromeos { // DOMBrowser: public ---------------------------------------------------------- DOMBrowser::DOMBrowser(Profile* profile) - : Browser(Browser::TYPE_NORMAL, profile) { + : Browser(Browser::TYPE_TABBED, profile) { } DOMBrowser::~DOMBrowser() { diff --git a/chrome/browser/chromeos/network_login_observer.cc b/chrome/browser/chromeos/network_login_observer.cc index 3325b83..388bcd7 100644 --- a/chrome/browser/chromeos/network_login_observer.cc +++ b/chrome/browser/chromeos/network_login_observer.cc @@ -28,10 +28,8 @@ NetworkLoginObserver::~NetworkLoginObserver() { void NetworkLoginObserver::CreateModalPopup(views::WindowDelegate* view) { Browser* browser = BrowserList::GetLastActive(); - if (browser && browser->type() != Browser::TYPE_NORMAL) { - browser = BrowserList::FindBrowserWithType(browser->profile(), - Browser::TYPE_NORMAL, - true); + if (browser && !browser->is_type_tabbed()) { + browser = BrowserList::FindTabbedBrowser(browser->profile(), true); } if (browser) { views::Window* window = browser::CreateViewsWindow( diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc index 7420b0d3..35c8d7c 100644 --- a/chrome/browser/chromeos/panels/panel_browsertest.cc +++ b/chrome/browser/chromeos/panels/panel_browsertest.cc @@ -56,7 +56,8 @@ IN_PROC_BROWSER_TEST_F(PanelTest, PanelOpenSmall) { } ASSERT_TRUE(new_browser); - EXPECT_EQ(Browser::TYPE_POPUP, new_browser->type()); + EXPECT_TRUE(new_browser->is_type_popup()); + EXPECT_FALSE(new_browser->is_app()); // This window type tells the cros window manager to treat the window // as a panel. EXPECT_EQ( diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc index d918e7b..ff0e0fd 100644 --- a/chrome/browser/chromeos/setting_level_bubble.cc +++ b/chrome/browser/chromeos/setting_level_bubble.cc @@ -51,9 +51,8 @@ static views::Widget* GetToplevelWidget() { // We just use the default profile here -- this gets overridden as needed // in Chrome OS depending on whether the user is logged in or not. Browser* browser = - BrowserList::FindBrowserWithType( + BrowserList::FindTabbedBrowser( ProfileManager::GetDefaultProfile(), - Browser::TYPE_NORMAL, true); // match_incognito if (browser) { window = GTK_WINDOW(browser->window()->GetNativeHandle()); diff --git a/chrome/browser/chromeos/status/window_switcher_button.cc b/chrome/browser/chromeos/status/window_switcher_button.cc index 6006dec..f51129d 100644 --- a/chrome/browser/chromeos/status/window_switcher_button.cc +++ b/chrome/browser/chromeos/status/window_switcher_button.cc @@ -20,7 +20,7 @@ int GetNormalBrowserCount() { int count = 0; BrowserList::const_iterator iter; for (iter = BrowserList::begin(); iter != BrowserList::end(); ++iter) { - if ((*iter)->type() == Browser::TYPE_NORMAL) + if ((*iter)->is_type_tabbed()) count++; } return count; diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.cc b/chrome/browser/chromeos/tab_closeable_state_watcher.cc index 81331e5..408c766 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher.cc @@ -81,14 +81,14 @@ TabCloseableStateWatcher::~TabCloseableStateWatcher() { } bool TabCloseableStateWatcher::CanCloseTab(const Browser* browser) const { - return browser->type() != Browser::TYPE_NORMAL ? true : - (can_close_tab_ || waiting_for_browser_); + return browser->is_type_tabbed() ? + (can_close_tab_ || waiting_for_browser_) : true; } bool TabCloseableStateWatcher::CanCloseTabs(const Browser* browser, std::vector<int>* indices) const { if (signing_off_ || waiting_for_browser_ || tabstrip_watchers_.size() > 1 || - browser->type() != Browser::TYPE_NORMAL || + !browser->is_type_tabbed() || (browser->profile()->IsOffTheRecord() && !guest_session_)) return true; @@ -155,8 +155,8 @@ void TabCloseableStateWatcher::OnWindowCloseCanceled(Browser* browser) { void TabCloseableStateWatcher::OnBrowserAdded(const Browser* browser) { waiting_for_browser_ = false; - // Only normal browsers may affect closeable state. - if (browser->type() != Browser::TYPE_NORMAL) + // Only tabbed browsers may affect closeable state. + if (!browser->is_type_tabbed()) return; // Create TabStripWatcher to observe tabstrip of new browser. @@ -167,8 +167,8 @@ void TabCloseableStateWatcher::OnBrowserAdded(const Browser* browser) { } void TabCloseableStateWatcher::OnBrowserRemoved(const Browser* browser) { - // Only normal browsers may affect closeable state. - if (browser->type() != Browser::TYPE_NORMAL) + // Only tabbed browsers may affect closeable state. + if (!browser->is_type_tabbed()) return; // Remove TabStripWatcher for browser that is being removed. @@ -225,7 +225,7 @@ void TabCloseableStateWatcher::OnTabStripChanged(const Browser* browser, void TabCloseableStateWatcher::CheckAndUpdateState( const Browser* browser_to_check) { if (waiting_for_browser_ || signing_off_ || tabstrip_watchers_.empty() || - (browser_to_check && browser_to_check->type() != Browser::TYPE_NORMAL)) + (browser_to_check && !browser_to_check->is_type_tabbed())) return; bool new_can_close; @@ -278,8 +278,8 @@ bool TabCloseableStateWatcher::CanCloseBrowserImpl( if (signing_off_) return true; - // Non-normal browsers are always closeable. - if (browser->type() != Browser::TYPE_NORMAL) + // Non-tabbed browsers are always closeable. + if (!browser->is_type_tabbed()) return true; // If this is not the last normal browser, it's always closeable. |