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

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: rebase on session change, fix tests 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 ChromeLauncherControllerMus; 14 class ChromeLauncherControllerMus;
15 class ChromeNewWindowClient; 15 class ChromeNewWindowClient;
16 class ImmersiveContextMus; 16 class ImmersiveContextMus;
17 class ImmersiveHandlerFactoryMus; 17 class ImmersiveHandlerFactoryMus;
18 class MediaClient; 18 class MediaClient;
19 class SessionControllerClient; 19 class SessionControllerClient;
20 class SystemTrayClient; 20 class SystemTrayClient;
21 class VolumeController; 21 class VolumeController;
22 class VpnListForwarder; 22 class VpnListForwarder;
23 23
24 // Browser initialization for Ash. Only runs on Chrome OS.
25 // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS.
24 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { 26 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
25 public: 27 public:
26 ChromeBrowserMainExtraPartsAsh(); 28 ChromeBrowserMainExtraPartsAsh();
27 ~ChromeBrowserMainExtraPartsAsh() override; 29 ~ChromeBrowserMainExtraPartsAsh() override;
28 30
29 // Overridden from ChromeBrowserMainExtraParts: 31 // Overridden from ChromeBrowserMainExtraParts:
30 void PreProfileInit() override; 32 void PreProfileInit() override;
31 void PostProfileInit() override; 33 void PostProfileInit() override;
32 void PostMainMessageLoopRun() override; 34 void PostMainMessageLoopRun() override;
33 35
34 private: 36 private:
35 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_; 37 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_;
36 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_; 38 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_;
37 std::unique_ptr<MediaClient> media_client_; 39 std::unique_ptr<MediaClient> media_client_;
38 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 40 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
39 std::unique_ptr<ImmersiveContextMus> immersive_context_; 41 std::unique_ptr<ImmersiveContextMus> immersive_context_;
40 std::unique_ptr<SessionControllerClient> session_controller_client_; 42 std::unique_ptr<SessionControllerClient> session_controller_client_;
41 std::unique_ptr<SystemTrayClient> system_tray_client_; 43 std::unique_ptr<SystemTrayClient> system_tray_client_;
42 std::unique_ptr<ChromeNewWindowClient> new_window_client_; 44 std::unique_ptr<ChromeNewWindowClient> new_window_client_;
43 std::unique_ptr<VolumeController> volume_controller_; 45 std::unique_ptr<VolumeController> volume_controller_;
44 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; 46 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_;
45 47
46 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); 48 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
47 }; 49 };
48 50
49 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 51 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698