diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-28 20:29:06 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-28 20:29:06 +0000 |
| commit | bede2a1c3cebe6a283788965b04d53bc2affb8ac (patch) | |
| tree | f56f249a8585db33f8e7966d297cf95e2f98e552 /ash/system | |
| parent | 7199829bdd00dd38d7de54293b9c01534ae6abb1 (diff) | |
| download | chromium_src-bede2a1c3cebe6a283788965b04d53bc2affb8ac.zip chromium_src-bede2a1c3cebe6a283788965b04d53bc2affb8ac.tar.gz chromium_src-bede2a1c3cebe6a283788965b04d53bc2affb8ac.tar.bz2 | |
Replace kFullscreenUsesMinimalChrome with ash::wm::WindowState::hide_shelf_when_fullscreen()
BUG=None
TEST=None
R=jamescook
TBR=sky (For trivial change in chrome/browser/notifications/fullscreen_notification_blocker.cc)
Review URL: https://codereview.chromium.org/32943006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/web_notification/web_notification_tray_unittest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index 763b0df..5ae2e49 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc @@ -16,7 +16,7 @@ #include "ash/system/tray/system_tray_item.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_system_tray_delegate.h" -#include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h" @@ -429,8 +429,10 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndFullscreen) { gfx::Rect work_area_auto_hidden = GetPopupWorkArea(); shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER); - // Make the window to use immersive mode. - window->SetProperty(internal::kFullscreenUsesMinimalChromeKey, true); + // Put |window| into fullscreen without forcing the shelf to hide. Currently, + // this is used by immersive fullscreen and forces the shelf to be auto + // hidden. + wm::GetWindowState(window.get())->set_hide_shelf_when_fullscreen(false); window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); RunAllPendingInMessageLoop(); |