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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/shelf_layout_manager.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
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | ash/wm/frame_border_hit_test_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index 390ab225750de60c3a32c859fe8a60bd53f0da88..570bac688f1f45079d4ca02772e7593606cd4b18 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -26,7 +26,6 @@
#include "ash/wm/lock_state_controller.h"
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/window_animations.h"
-#include "ash/wm/window_properties.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "ash/wm/workspace_controller.h"
@@ -544,9 +543,8 @@ bool ShelfLayoutManager::FullscreenWithMinimalChrome() const {
const aura::Window* window = controller->GetTopmostFullscreenWindow();
if (!window)
return false;
- if (!window->GetProperty(kFullscreenUsesMinimalChromeKey))
- return false;
- return true;
+ return wm::GetWindowState(window)->fullscreen_type() ==
+ wm::FULLSCREEN_TYPE_IMMERSIVE_MINIMAL_CHROME;
}
// static
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | ash/wm/frame_border_hit_test_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698