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

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

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: Created 4 years, 6 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
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/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/aura/wm_shelf_aura.h" 8 #include "ash/aura/wm_shelf_aura.h"
9 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/shelf/shelf_constants.h" 11 #include "ash/common/shelf/shelf_constants.h"
11 #include "ash/common/shelf/shelf_model.h" 12 #include "ash/common/shelf/shelf_model.h"
12 #include "ash/common/shelf/wm_shelf_util.h" 13 #include "ash/common/shelf/wm_shelf_util.h"
13 #include "ash/common/shell_window_ids.h" 14 #include "ash/common/shell_window_ids.h"
14 #include "ash/common/wm_root_window_controller.h" 15 #include "ash/common/wm_root_window_controller.h"
15 #include "ash/focus_cycler.h" 16 #include "ash/focus_cycler.h"
16 #include "ash/session/session_state_delegate.h"
17 #include "ash/shelf/shelf_delegate.h" 17 #include "ash/shelf/shelf_delegate.h"
18 #include "ash/shelf/shelf_layout_manager.h" 18 #include "ash/shelf/shelf_layout_manager.h"
19 #include "ash/shelf/shelf_navigator.h" 19 #include "ash/shelf/shelf_navigator.h"
20 #include "ash/shelf/shelf_util.h" 20 #include "ash/shelf/shelf_util.h"
21 #include "ash/shelf/shelf_view.h" 21 #include "ash/shelf/shelf_view.h"
22 #include "ash/shelf/shelf_widget.h" 22 #include "ash/shelf/shelf_widget.h"
23 #include "ash/shell.h" 23 #include "ash/shell.h"
24 #include "ash/system/tray/system_tray_delegate.h" 24 #include "ash/system/tray/system_tray_delegate.h"
25 #include "ash/wm/status_area_layout_manager.h" 25 #include "ash/wm/status_area_layout_manager.h"
26 #include "ash/wm/window_properties.h" 26 #include "ash/wm/window_properties.h"
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 shelf_layout_manager_->UpdateAutoHideForMouseEvent(event); 814 shelf_layout_manager_->UpdateAutoHideForMouseEvent(event);
815 } 815 }
816 816
817 void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) { 817 void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) {
818 Widget::OnGestureEvent(event); 818 Widget::OnGestureEvent(event);
819 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_) 819 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
820 shelf_layout_manager_->UpdateAutoHideForGestureEvent(event); 820 shelf_layout_manager_->UpdateAutoHideForGestureEvent(event);
821 } 821 }
822 822
823 } // namespace ash 823 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698