diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 01:56:53 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 01:56:53 +0000 |
| commit | bee9645265c07b29d7d65acdd4257bfa3c06d424 (patch) | |
| tree | 0cfeac8a9b6df447ca11ada9a6fd410c00cf63ba /chrome/browser/ui/browser_command_controller_unittest.cc | |
| parent | adc9ef3ef389cfad6fb99dff2b767d72785045b6 (diff) | |
| download | chromium_src-bee9645265c07b29d7d65acdd4257bfa3c06d424.zip chromium_src-bee9645265c07b29d7d65acdd4257bfa3c06d424.tar.gz chromium_src-bee9645265c07b29d7d65acdd4257bfa3c06d424.tar.bz2 | |
Enable fullscreen for apps windows
This CL allows apps windows to enter fullscreen on all platforms.
This fixes a regression introduced by r167006.
BUG=161246
Review URL: https://chromiumcodereview.appspot.com/11308085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_command_controller_unittest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_command_controller_unittest.cc | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc index 54b0b37..4e66090 100644 --- a/chrome/browser/ui/browser_command_controller_unittest.cc +++ b/chrome/browser/ui/browser_command_controller_unittest.cc @@ -6,6 +6,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window_state.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/native_web_keyboard_event.h" @@ -117,3 +118,28 @@ TEST_F(BrowserWithTestWindowTest, IsReservedCommandOrKeyIsApp) { ui::ET_KEY_PRESSED, false, ui::VKEY_F, ui::EF_CONTROL_DOWN, 0))); #endif // USE_AURA } + +TEST_F(BrowserWithTestWindowTest, AppFullScreen) { + // Enable for tabbed browser. + EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN)); + + // Enabled for app windows. + browser()->app_name_ = "app"; + ASSERT_TRUE(browser()->is_app()); + browser()->command_controller()->FullscreenStateChanged(); + EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN)); + + // Enabled for panels. + Browser::CreateParams panel_params(Browser::TYPE_PANEL, profile()); + TestBrowserWindow panel_window; + panel_params.window = &panel_window; + Browser panel_browser(panel_params); + ASSERT_TRUE(panel_browser.is_type_panel()); + EXPECT_TRUE(chrome::IsCommandEnabled(&panel_browser, IDC_FULLSCREEN)); + + // Disabled for app-panels. + panel_browser.app_name_ = "app"; + ASSERT_TRUE(panel_browser.is_app()); + panel_browser.command_controller()->FullscreenStateChanged(); + EXPECT_FALSE(chrome::IsCommandEnabled(&panel_browser, IDC_FULLSCREEN)); +} |