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

Side by Side Diff: ash/shelf/shelf_controller.h

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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_constants.cc ('k') | ash/shelf/shelf_controller.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_COMMON_SHELF_SHELF_CONTROLLER_H_ 5 #ifndef ASH_SHELF_SHELF_CONTROLLER_H_
6 #define ASH_COMMON_SHELF_SHELF_CONTROLLER_H_ 6 #define ASH_SHELF_SHELF_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "ash/common/shelf/shelf_item_types.h"
12 #include "ash/common/shelf/shelf_model.h"
13 #include "ash/public/cpp/shelf_types.h" 11 #include "ash/public/cpp/shelf_types.h"
14 #include "ash/public/interfaces/shelf.mojom.h" 12 #include "ash/public/interfaces/shelf.mojom.h"
13 #include "ash/shelf/shelf_item_types.h"
14 #include "ash/shelf/shelf_model.h"
15 #include "mojo/public/cpp/bindings/binding_set.h" 15 #include "mojo/public/cpp/bindings/binding_set.h"
16 #include "mojo/public/cpp/bindings/interface_ptr_set.h" 16 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
17 17
18 namespace ash { 18 namespace ash {
19 19
20 class WmShelf; 20 class WmShelf;
21 21
22 // Ash's implementation of the mojom::ShelfController interface. Chrome connects 22 // Ash's implementation of the mojom::ShelfController interface. Chrome connects
23 // to this interface to observe and manage the per-display ash shelf instances. 23 // to this interface to observe and manage the per-display ash shelf instances.
24 class ShelfController : public mojom::ShelfController { 24 class ShelfController : public mojom::ShelfController {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 // Mappings between application and shelf ids. 67 // Mappings between application and shelf ids.
68 std::map<std::string, ShelfID> app_id_to_shelf_id_; 68 std::map<std::string, ShelfID> app_id_to_shelf_id_;
69 std::map<ShelfID, std::string> shelf_id_to_app_id_; 69 std::map<ShelfID, std::string> shelf_id_to_app_id_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(ShelfController); 71 DISALLOW_COPY_AND_ASSIGN(ShelfController);
72 }; 72 };
73 73
74 } // namespace ash 74 } // namespace ash
75 75
76 #endif // ASH_COMMON_SHELF_SHELF_CONTROLLER_H_ 76 #endif // ASH_SHELF_SHELF_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_constants.cc ('k') | ash/shelf/shelf_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698