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

Side by Side Diff: ash/mus/shelf_delegate_mus.h

Issue 2376103005: mustash: Break dependency of //ash/public/interfaces on //ash (Closed)
Patch Set: typo Created 4 years, 2 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 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_MUS_SHELF_DELEGATE_MUS_H_ 5 #ifndef ASH_MUS_SHELF_DELEGATE_MUS_H_
6 #define ASH_MUS_SHELF_DELEGATE_MUS_H_ 6 #define ASH_MUS_SHELF_DELEGATE_MUS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "ash/common/shelf/shelf_delegate.h" 11 #include "ash/common/shelf/shelf_delegate.h"
12 #include "ash/common/shelf/shelf_types.h" 12 #include "ash/public/cpp/shelf_types.h"
13 #include "ash/public/interfaces/shelf.mojom.h" 13 #include "ash/public/interfaces/shelf.mojom.h"
14 #include "mojo/public/cpp/bindings/binding.h" 14 #include "mojo/public/cpp/bindings/binding.h"
15 #include "mojo/public/cpp/bindings/interface_ptr_set.h" 15 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
16 16
17 namespace ash { 17 namespace ash {
18 18
19 class ShelfModel; 19 class ShelfModel;
20 20
21 // Manages communication between the mash shelf and the browser. 21 // Manages communication between the mash shelf and the browser.
22 class ShelfDelegateMus : public ShelfDelegate, public mojom::ShelfController { 22 class ShelfDelegateMus : public ShelfDelegate, public mojom::ShelfController {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 std::map<std::string, ShelfID> app_id_to_shelf_id_; 60 std::map<std::string, ShelfID> app_id_to_shelf_id_;
61 std::map<ShelfID, std::string> shelf_id_to_app_id_; 61 std::map<ShelfID, std::string> shelf_id_to_app_id_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus); 63 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus);
64 }; 64 };
65 65
66 } // namespace ash 66 } // namespace ash
67 67
68 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_ 68 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698