diff options
| author | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 21:44:19 +0000 |
|---|---|---|
| committer | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 21:44:19 +0000 |
| commit | f25b8052531b1d4668d1d9ed60b1151af4ca3ab2 (patch) | |
| tree | 2feb3529ef9e9115b5cff481bd3fa4b4433fa354 /chrome/browser/ui | |
| parent | addb3240a6f92131d41b318ed2d880920f30d1c1 (diff) | |
| download | chromium_src-f25b8052531b1d4668d1d9ed60b1151af4ca3ab2.zip chromium_src-f25b8052531b1d4668d1d9ed60b1151af4ca3ab2.tar.gz chromium_src-f25b8052531b1d4668d1d9ed60b1151af4ca3ab2.tar.bz2 | |
Re-enable WindowOpenPanel test for all platforms.
Was previously only enabled for Mac and GTK.
BUG=None
TEST=WindowOpenPanelTest.WindowOpenPanel in browser_tests.
Review URL: http://codereview.chromium.org/7108050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc index 2d82fa0..8380adb 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc @@ -4,18 +4,31 @@ #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" +#include "base/command_line.h" +#include "chrome/browser/ui/panels/panel_browser_frame_view.h" +#include "chrome/browser/ui/panels/panel_browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" #include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h" +#include "chrome/common/chrome_switches.h" namespace browser { BrowserNonClientFrameView* CreateBrowserNonClientFrameView( BrowserFrame* frame, BrowserView* browser_view) { - if (browser_view->IsBrowserTypePopup() || browser_view->IsBrowserTypePanel()) - return new PopupNonClientFrameView(frame); - else - return new OpaqueBrowserFrameView(frame, browser_view); + Browser::Type type = browser_view->browser()->type(); + switch (type) { + case Browser::TYPE_PANEL: + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnablePanels)) { + return new PanelBrowserFrameView( + frame, static_cast<PanelBrowserView*>(browser_view)); + } // else, fall-through and treat as popup + case Browser::TYPE_POPUP: + return new PopupNonClientFrameView(frame); + default: + return new OpaqueBrowserFrameView(frame, browser_view); + } } } // browser |