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

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

Issue 2628933003: Revert of Reland: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: 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 25
26 // Browser initialization for Ash. Only runs on Chrome OS.
27 // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS.
28 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { 26 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
29 public: 27 public:
30 explicit ChromeBrowserMainExtraPartsAsh( 28 explicit ChromeBrowserMainExtraPartsAsh(
31 ChromeBrowserMainExtraPartsViews* extra_parts_views); 29 ChromeBrowserMainExtraPartsViews* extra_parts_views);
32 ~ChromeBrowserMainExtraPartsAsh() override; 30 ~ChromeBrowserMainExtraPartsAsh() override;
33 31
34 // Overridden from ChromeBrowserMainExtraParts: 32 // Overridden from ChromeBrowserMainExtraParts:
35 void PreProfileInit() override; 33 void PreProfileInit() override;
36 void PostProfileInit() override; 34 void PostProfileInit() override;
37 void PostMainMessageLoopRun() override; 35 void PostMainMessageLoopRun() override;
(...skipping 10 matching lines...) Expand all
48 std::unique_ptr<SessionControllerClient> session_controller_client_; 46 std::unique_ptr<SessionControllerClient> session_controller_client_;
49 std::unique_ptr<SystemTrayClient> system_tray_client_; 47 std::unique_ptr<SystemTrayClient> system_tray_client_;
50 std::unique_ptr<ChromeNewWindowClient> new_window_client_; 48 std::unique_ptr<ChromeNewWindowClient> new_window_client_;
51 std::unique_ptr<VolumeController> volume_controller_; 49 std::unique_ptr<VolumeController> volume_controller_;
52 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; 50 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_;
53 51
54 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); 52 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
55 }; 53 };
56 54
57 #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/browser_browsertest.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