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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h

Issue 2655513002: mash: Relay some Chrome aura window properties to Ash. (Closed)
Patch Set: More cleanup. Created 3 years, 11 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 CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "chrome/browser/chrome_browser_main_extra_parts.h" 11 #include "chrome/browser/chrome_browser_main_extra_parts.h"
12 12
13 class CastConfigClientMediaRouter; 13 class CastConfigClientMediaRouter;
14 class ChromeBrowserMainExtraPartsViews; 14 class ChromeBrowserMainExtraPartsViews;
15 class ChromeLauncherControllerMus; 15 class ChromeLauncherControllerMus;
16 class ChromeNewWindowClient; 16 class ChromeNewWindowClient;
17 class ChromeShellContentState; 17 class ChromeShellContentState;
18 class ImmersiveContextMus; 18 class ImmersiveContextMus;
19 class ImmersiveHandlerFactoryMus; 19 class ImmersiveHandlerFactoryMus;
20 class MediaClient; 20 class MediaClient;
21 class SessionControllerClient; 21 class SessionControllerClient;
22 class SystemTrayClient; 22 class SystemTrayClient;
23 class VolumeController; 23 class VolumeController;
24 class VpnListForwarder; 24 class VpnListForwarder;
25 class WindowPropertyRelay;
25 26
26 // Browser initialization for Ash. Only runs on Chrome OS. 27 // Browser initialization for Ash. Only runs on Chrome OS.
27 // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS. 28 // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS.
28 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { 29 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
29 public: 30 public:
30 explicit ChromeBrowserMainExtraPartsAsh( 31 explicit ChromeBrowserMainExtraPartsAsh(
31 ChromeBrowserMainExtraPartsViews* extra_parts_views); 32 ChromeBrowserMainExtraPartsViews* extra_parts_views);
32 ~ChromeBrowserMainExtraPartsAsh() override; 33 ~ChromeBrowserMainExtraPartsAsh() override;
33 34
34 // Overridden from ChromeBrowserMainExtraParts: 35 // Overridden from ChromeBrowserMainExtraParts:
36 void ServiceManagerConnectionStarted(
37 content::ServiceManagerConnection* connection) override;
35 void PreProfileInit() override; 38 void PreProfileInit() override;
36 void PostProfileInit() override; 39 void PostProfileInit() override;
37 void PostMainMessageLoopRun() override; 40 void PostMainMessageLoopRun() override;
38 41
39 private: 42 private:
40 ChromeBrowserMainExtraPartsViews* extra_parts_views_; 43 ChromeBrowserMainExtraPartsViews* extra_parts_views_;
41 44
42 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_; 45 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_;
43 std::unique_ptr<ChromeShellContentState> chrome_shell_content_state_; 46 std::unique_ptr<ChromeShellContentState> chrome_shell_content_state_;
44 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_; 47 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_;
45 std::unique_ptr<MediaClient> media_client_; 48 std::unique_ptr<MediaClient> media_client_;
46 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 49 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
47 std::unique_ptr<ImmersiveContextMus> immersive_context_; 50 std::unique_ptr<ImmersiveContextMus> immersive_context_;
48 std::unique_ptr<SessionControllerClient> session_controller_client_; 51 std::unique_ptr<SessionControllerClient> session_controller_client_;
49 std::unique_ptr<SystemTrayClient> system_tray_client_; 52 std::unique_ptr<SystemTrayClient> system_tray_client_;
50 std::unique_ptr<ChromeNewWindowClient> new_window_client_; 53 std::unique_ptr<ChromeNewWindowClient> new_window_client_;
51 std::unique_ptr<VolumeController> volume_controller_; 54 std::unique_ptr<VolumeController> volume_controller_;
52 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; 55 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_;
56 std::unique_ptr<WindowPropertyRelay> window_property_relay_;
53 57
54 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); 58 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
55 }; 59 };
56 60
57 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 61 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698