Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2072)

Unified Diff: ash/system/web_notification/web_notification_tray_unittest.cc

Issue 27458002: Allow setting different hit test bounds overrides for mouse and touch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/web_notification/web_notification_tray_unittest.cc
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
index d763a5635f5b92d6fb8ebbaea455e043b5f539fe..4fec3e5cecdecb1d03eff54673036121610c3704 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,9 +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);
+ // Make the window use browser immersive fullscreen.
window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
+ wm::GetWindowState(window.get())->SetFullscreenType(
+ wm::FULLSCREEN_TYPE_IMMERSIVE_MINIMAL_CHROME);
RunAllPendingInMessageLoop();
// The work area for auto-hidden status of fullscreen is a bit larger

Powered by Google App Engine
This is Rietveld 408576698