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

Side by Side Diff: components/arc/window_manager/arc_window_manager_bridge.h

Issue 2047373002: Moves ShellObserver to ash/common (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
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 COMPONENTS_ARC_WINDOW_MANAGER_ARC_WINDOW_MANAGER_BRIDGE_H_ 5 #ifndef COMPONENTS_ARC_WINDOW_MANAGER_ARC_WINDOW_MANAGER_BRIDGE_H_
6 #define COMPONENTS_ARC_WINDOW_MANAGER_ARC_WINDOW_MANAGER_BRIDGE_H_ 6 #define COMPONENTS_ARC_WINDOW_MANAGER_ARC_WINDOW_MANAGER_BRIDGE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell_observer.h" 10 #include "ash/common/shell_observer.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "components/arc/arc_bridge_service.h" 12 #include "components/arc/arc_bridge_service.h"
13 #include "components/arc/arc_service.h" 13 #include "components/arc/arc_service.h"
14 14
15 namespace arc { 15 namespace arc {
16 16
17 class ArcWindowManagerBridge : public ArcService, 17 class ArcWindowManagerBridge : public ArcService,
18 public ArcBridgeService::Observer, 18 public ArcBridgeService::Observer,
19 public ash::ShellObserver { 19 public ash::ShellObserver {
20 public: 20 public:
(...skipping 12 matching lines...) Expand all
33 33
34 // Remembers the currently set mode on the Android side. 34 // Remembers the currently set mode on the Android side.
35 mojom::WindowManagerMode current_mode_; 35 mojom::WindowManagerMode current_mode_;
36 36
37 DISALLOW_COPY_AND_ASSIGN(ArcWindowManagerBridge); 37 DISALLOW_COPY_AND_ASSIGN(ArcWindowManagerBridge);
38 }; 38 };
39 39
40 } // namespace arc 40 } // namespace arc
41 41
42 #endif // COMPONENTS_ARC_WINDOW_MANAGER_ARC_WINDOW_MANAGER_BRIDGE_H_ 42 #endif // COMPONENTS_ARC_WINDOW_MANAGER_ARC_WINDOW_MANAGER_BRIDGE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h ('k') | components/exo/wayland/server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698