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

Side by Side Diff: ash/shelf/shelf_widget.cc

Issue 2227143003: mash: Move AutoHideEventHandler to WmShelfAura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « ash/shelf/shelf_widget.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shelf/shelf_widget.h" 5 #include "ash/shelf/shelf_widget.h"
6 6
7 #include "ash/aura/wm_shelf_aura.h" 7 #include "ash/aura/wm_shelf_aura.h"
8 #include "ash/common/focus_cycler.h" 8 #include "ash/common/focus_cycler.h"
9 #include "ash/common/material_design/material_design_controller.h" 9 #include "ash/common/material_design/material_design_controller.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/common/shelf/shelf_background_animator_observer.h" 11 #include "ash/common/shelf/shelf_background_animator_observer.h"
12 #include "ash/common/shelf/shelf_constants.h" 12 #include "ash/common/shelf/shelf_constants.h"
13 #include "ash/common/shelf/shelf_delegate.h" 13 #include "ash/common/shelf/shelf_delegate.h"
14 #include "ash/common/shelf/wm_shelf.h" 14 #include "ash/common/shelf/wm_shelf.h"
15 #include "ash/common/shelf/wm_shelf_util.h" 15 #include "ash/common/shelf/wm_shelf_util.h"
16 #include "ash/common/system/status_area_widget.h" 16 #include "ash/common/system/status_area_widget.h"
17 #include "ash/common/system/tray/system_tray_delegate.h" 17 #include "ash/common/system/tray/system_tray_delegate.h"
18 #include "ash/common/wm_root_window_controller.h" 18 #include "ash/common/wm_root_window_controller.h"
19 #include "ash/common/wm_shell.h" 19 #include "ash/common/wm_shell.h"
20 #include "ash/common/wm_window.h" 20 #include "ash/common/wm_window.h"
21 #include "ash/shelf/dimmer_view.h" 21 #include "ash/shelf/dimmer_view.h"
22 #include "ash/shelf/shelf.h" 22 #include "ash/shelf/shelf.h"
23 #include "ash/shelf/shelf_layout_manager.h" 23 #include "ash/shelf/shelf_layout_manager.h"
24 #include "ash/shell.h"
25 #include "ash/wm/status_area_layout_manager.h" 24 #include "ash/wm/status_area_layout_manager.h"
26 #include "ash/wm/workspace_controller.h" 25 #include "ash/wm/workspace_controller.h"
27 #include "base/memory/ptr_util.h" 26 #include "base/memory/ptr_util.h"
28 #include "grit/ash_resources.h" 27 #include "grit/ash_resources.h"
29 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
30 #include "ui/compositor/layer.h" 29 #include "ui/compositor/layer.h"
31 #include "ui/compositor/scoped_layer_animation_settings.h" 30 #include "ui/compositor/scoped_layer_animation_settings.h"
32 #include "ui/gfx/canvas.h" 31 #include "ui/gfx/canvas.h"
33 #include "ui/gfx/image/image.h" 32 #include "ui/gfx/image/image.h"
34 #include "ui/gfx/image/image_skia_operations.h" 33 #include "ui/gfx/image/image_skia_operations.h"
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 void ShelfWidget::UpdateShelfItemBackground(int alpha) { 511 void ShelfWidget::UpdateShelfItemBackground(int alpha) {
513 if (shelf_) 512 if (shelf_)
514 shelf_->UpdateShelfItemBackground(alpha); 513 shelf_->UpdateShelfItemBackground(alpha);
515 } 514 }
516 515
517 void ShelfWidget::WillDeleteShelfLayoutManager() { 516 void ShelfWidget::WillDeleteShelfLayoutManager() {
518 shelf_layout_manager_->RemoveObserver(this); 517 shelf_layout_manager_->RemoveObserver(this);
519 shelf_layout_manager_ = nullptr; 518 shelf_layout_manager_ = nullptr;
520 } 519 }
521 520
522 void ShelfWidget::OnMouseEvent(ui::MouseEvent* event) {
523 Widget::OnMouseEvent(event);
524 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
525 shelf_layout_manager_->UpdateAutoHideForMouseEvent(event);
526 }
527
528 void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) {
529 Widget::OnGestureEvent(event);
530 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
531 shelf_layout_manager_->UpdateAutoHideForGestureEvent(event);
532 }
533
534 } // namespace ash 521 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698