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

Side by Side Diff: ash/wm/aura/wm_shelf_aura.h

Issue 2030593002: Renames ash/wm/common into ash/common/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/wm/aura/wm_root_window_controller_aura.cc ('k') | ash/wm/aura/wm_shelf_aura.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_WM_AURA_WM_SHELF_AURA_H_ 5 #ifndef ASH_WM_AURA_WM_SHELF_AURA_H_
6 #define ASH_WM_AURA_WM_SHELF_AURA_H_ 6 #define ASH_WM_AURA_WM_SHELF_AURA_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/wm/shelf/wm_shelf.h"
9 #include "ash/shelf/shelf_icon_observer.h" 10 #include "ash/shelf/shelf_icon_observer.h"
10 #include "ash/shelf/shelf_layout_manager_observer.h" 11 #include "ash/shelf/shelf_layout_manager_observer.h"
11 #include "ash/wm/common/shelf/wm_shelf.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 14
15 namespace ash { 15 namespace ash {
16 16
17 class Shelf; 17 class Shelf;
18 class ShelfLayoutManager; 18 class ShelfLayoutManager;
19 19
20 namespace wm { 20 namespace wm {
21 21
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 // WmShelfAura. 56 // WmShelfAura.
57 ShelfLayoutManager* shelf_layout_manager_; 57 ShelfLayoutManager* shelf_layout_manager_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); 59 DISALLOW_COPY_AND_ASSIGN(WmShelfAura);
60 }; 60 };
61 61
62 } // namespace wm 62 } // namespace wm
63 } // namespace ash 63 } // namespace ash
64 64
65 #endif // ASH_WM_AURA_WM_SHELF_AURA_H_ 65 #endif // ASH_WM_AURA_WM_SHELF_AURA_H_
OLDNEW
« no previous file with comments | « ash/wm/aura/wm_root_window_controller_aura.cc ('k') | ash/wm/aura/wm_shelf_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698