ash/shelf/shelf_widget.cc - Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly

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

« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »

OLD	NEW
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/shelf/shelf_constants.h"	10 #include "ash/common/shelf/shelf_constants.h"

	11 #include "ash/common/shelf/shelf_model.h"

11 #include "ash/common/shelf/wm_shelf_util.h"	12 #include "ash/common/shelf/wm_shelf_util.h"

12 #include "ash/common/shell_window_ids.h"	13 #include "ash/common/shell_window_ids.h"

13 #include "ash/common/wm_root_window_controller.h"	14 #include "ash/common/wm_root_window_controller.h"

14 #include "ash/focus_cycler.h"	15 #include "ash/focus_cycler.h"

15 #include "ash/session/session_state_delegate.h"	16 #include "ash/session/session_state_delegate.h"

16 #include "ash/shelf/shelf_delegate.h"	17 #include "ash/shelf/shelf_delegate.h"

17 #include "ash/shelf/shelf_layout_manager.h"	18 #include "ash/shelf/shelf_layout_manager.h"

18 #include "ash/shelf/shelf_model.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"

27 #include "ash/wm/workspace_controller.h"	27 #include "ash/wm/workspace_controller.h"

28 #include "grit/ash_resources.h"	28 #include "grit/ash_resources.h"

(...skipping 785 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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

OLD	NEW