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

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 133873004: aura: Remove Window::SetHitTestBoundsOverrideOuter() and related methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 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/shelf/shelf_layout_manager.h ('k') | ash/wm/frame_border_hit_test_controller.cc » ('j') | no next file with comments »
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 b78cc15bf9eb2da7ee6f5cb37af8c3b8367e8ebc..06a466d9be2190b8fae13e33b48c449448c9a666 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -706,7 +706,6 @@ void ShelfLayoutManager::UpdateBoundsAndOpacity(
status_bounds));
Shell::GetInstance()->SetDisplayWorkAreaInsets(
root_window_, target_bounds.work_area_insets);
- UpdateHitTestBounds();
}
void ShelfLayoutManager::StopAnimating() {
@@ -1087,26 +1086,6 @@ ShelfAutoHideState ShelfLayoutManager::CalculateAutoHideState(
return SHELF_AUTO_HIDE_HIDDEN;
}
-void ShelfLayoutManager::UpdateHitTestBounds() {
- gfx::Insets mouse_insets;
- gfx::Insets touch_insets;
- if (state_.visibility_state == SHELF_VISIBLE) {
- // Let clicks at the very top of the shelf through so windows can be
- // resized with the bottom-right corner and bottom edge.
- mouse_insets = GetInsetsForAlignment(kWorkspaceAreaVisibleInset);
- } else if (state_.visibility_state == SHELF_AUTO_HIDE) {
- // Extend the touch hit target out a bit to allow users to drag shelf out
- // while hidden.
- touch_insets = GetInsetsForAlignment(-kWorkspaceAreaAutoHideInset);
- }
-
- if (shelf_ && shelf_->GetNativeWindow())
- shelf_->GetNativeWindow()->SetHitTestBoundsOverrideOuter(mouse_insets,
- touch_insets);
- shelf_->status_area_widget()->GetNativeWindow()->
- SetHitTestBoundsOverrideOuter(mouse_insets, touch_insets);
-}
-
bool ShelfLayoutManager::IsShelfWindow(aura::Window* window) {
if (!window)
return false;
« no previous file with comments | « ash/shelf/shelf_layout_manager.h ('k') | ash/wm/frame_border_hit_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698