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

Side by Side Diff: ash/root_window_controller.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: gyp 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 (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_ROOT_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_
6 #define ASH_ROOT_WINDOW_CONTROLLER_H_ 6 #define ASH_ROOT_WINDOW_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/shelf/shelf_types.h" 12 #include "ash/common/shelf/shelf_types.h"
13 #include "ash/shell_observer.h" 13 #include "ash/shell_observer.h"
14 #include "ash/system/user/login_status.h" 14 #include "ash/system/user/login_status.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/aura/window_tree_host.h" 17 #include "ui/aura/window_tree_host.h"
18 #include "ui/base/ui_base_types.h" 18 #include "ui/base/ui_base_types.h"
19 19
20 class SkBitmap; 20 class SkBitmap;
21 21
22 namespace aura { 22 namespace aura {
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 324
325 // On classic ash, returns the RootWindowController for the given |root_window|. 325 // On classic ash, returns the RootWindowController for the given |root_window|.
326 // On mus ash, returns the RootWindowController for the primary display. 326 // On mus ash, returns the RootWindowController for the primary display.
327 // See RootWindowController class comment above. 327 // See RootWindowController class comment above.
328 ASH_EXPORT RootWindowController* GetRootWindowController( 328 ASH_EXPORT RootWindowController* GetRootWindowController(
329 const aura::Window* root_window); 329 const aura::Window* root_window);
330 330
331 } // namespace ash 331 } // namespace ash
332 332
333 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 333 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698