ash/shelf/shelf_layout_manager.cc - Issue 27458002: Allow setting different hit test bounds overrides for mouse and touch

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

Index: ash/shelf/shelf_layout_manager.cc

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc

index d5441c40c4475fbe307fee0b52a6e7b1b1d93273..5792f66a5a3da84de6951d7fa50d3738c100a8fe 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