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

Side by Side Diff: ash/shell.h

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again 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_window_watcher.cc ('k') | ash/shell/context_menu.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/common/shelf/shelf_types.h"
13 #include "ash/metrics/user_metrics_recorder.h" 14 #include "ash/metrics/user_metrics_recorder.h"
14 #include "ash/shelf/shelf_types.h"
15 #include "ash/system/user/login_status.h" 15 #include "ash/system/user/login_status.h"
16 #include "ash/wm/cursor_manager_chromeos.h" 16 #include "ash/wm/cursor_manager_chromeos.h"
17 #include "ash/wm/system_modal_container_event_filter_delegate.h" 17 #include "ash/wm/system_modal_container_event_filter_delegate.h"
18 #include "base/compiler_specific.h" 18 #include "base/compiler_specific.h"
19 #include "base/gtest_prod_util.h" 19 #include "base/gtest_prod_util.h"
20 #include "base/macros.h" 20 #include "base/macros.h"
21 #include "base/memory/weak_ptr.h" 21 #include "base/memory/weak_ptr.h"
22 #include "base/observer_list.h" 22 #include "base/observer_list.h"
23 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
24 #include "ui/base/ui_base_types.h" 24 #include "ui/base/ui_base_types.h"
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 bool in_mus_ = false; 805 bool in_mus_ = false;
806 806
807 std::unique_ptr<KeyboardUI> keyboard_ui_; 807 std::unique_ptr<KeyboardUI> keyboard_ui_;
808 808
809 DISALLOW_COPY_AND_ASSIGN(Shell); 809 DISALLOW_COPY_AND_ASSIGN(Shell);
810 }; 810 };
811 811
812 } // namespace ash 812 } // namespace ash
813 813
814 #endif // ASH_SHELL_H_ 814 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shell/context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698