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

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

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: msw comments Created 4 years 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 ImmersiveContextMus; 17 class ImmersiveContextMus;
18 class ImmersiveHandlerFactoryMus; 18 class ImmersiveHandlerFactoryMus;
19 class MediaClient; 19 class MediaClient;
20 class SessionControllerClient; 20 class SessionControllerClient;
21 class SystemTrayClient; 21 class SystemTrayClient;
22 class VolumeController; 22 class VolumeController;
23 class VpnListForwarder; 23 class VpnListForwarder;
24 24
25 // Browser initialization for Ash. Only runs on Chrome OS.
26 // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS.
25 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { 27 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
26 public: 28 public:
27 explicit ChromeBrowserMainExtraPartsAsh( 29 explicit ChromeBrowserMainExtraPartsAsh(
28 ChromeBrowserMainExtraPartsViews* extra_parts_views); 30 ChromeBrowserMainExtraPartsViews* extra_parts_views);
29 ~ChromeBrowserMainExtraPartsAsh() override; 31 ~ChromeBrowserMainExtraPartsAsh() override;
30 32
31 // Overridden from ChromeBrowserMainExtraParts: 33 // Overridden from ChromeBrowserMainExtraParts:
32 void PreProfileInit() override; 34 void PreProfileInit() override;
33 void PostProfileInit() override; 35 void PostProfileInit() override;
34 void PostMainMessageLoopRun() override; 36 void PostMainMessageLoopRun() override;
35 37
36 private: 38 private:
37 ChromeBrowserMainExtraPartsViews* extra_parts_views_; 39 ChromeBrowserMainExtraPartsViews* extra_parts_views_;
38 40
39 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_; 41 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_;
40 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_; 42 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_;
41 std::unique_ptr<MediaClient> media_client_; 43 std::unique_ptr<MediaClient> media_client_;
42 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 44 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
43 std::unique_ptr<ImmersiveContextMus> immersive_context_; 45 std::unique_ptr<ImmersiveContextMus> immersive_context_;
44 std::unique_ptr<SessionControllerClient> session_controller_client_; 46 std::unique_ptr<SessionControllerClient> session_controller_client_;
45 std::unique_ptr<SystemTrayClient> system_tray_client_; 47 std::unique_ptr<SystemTrayClient> system_tray_client_;
46 std::unique_ptr<ChromeNewWindowClient> new_window_client_; 48 std::unique_ptr<ChromeNewWindowClient> new_window_client_;
47 std::unique_ptr<VolumeController> volume_controller_; 49 std::unique_ptr<VolumeController> volume_controller_;
48 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; 50 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_;
49 51
50 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); 52 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
51 }; 53 };
52 54
53 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 55 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/session_controller_client.cc ('k') | chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698