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

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

Issue 2777223002: Gets chrome --mus some what working (Closed)
Patch Set: fix mac Created 3 years, 8 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 AshInit;
13 class CastConfigClientMediaRouter; 14 class CastConfigClientMediaRouter;
14 class ChromeLauncherControllerMus; 15 class ChromeLauncherControllerMus;
15 class ChromeNewWindowClient; 16 class ChromeNewWindowClient;
16 class ChromeShellContentState; 17 class ChromeShellContentState;
17 class ImmersiveContextMus; 18 class ImmersiveContextMus;
18 class ImmersiveHandlerFactoryMus; 19 class ImmersiveHandlerFactoryMus;
19 class MediaClient; 20 class MediaClient;
20 class SessionControllerClient; 21 class SessionControllerClient;
21 class SystemTrayClient; 22 class SystemTrayClient;
22 class VolumeController; 23 class VolumeController;
(...skipping 18 matching lines...) Expand all
41 std::unique_ptr<ChromeShellContentState> chrome_shell_content_state_; 42 std::unique_ptr<ChromeShellContentState> chrome_shell_content_state_;
42 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_; 43 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_;
43 std::unique_ptr<MediaClient> media_client_; 44 std::unique_ptr<MediaClient> media_client_;
44 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 45 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
45 std::unique_ptr<ImmersiveContextMus> immersive_context_; 46 std::unique_ptr<ImmersiveContextMus> immersive_context_;
46 std::unique_ptr<SessionControllerClient> session_controller_client_; 47 std::unique_ptr<SessionControllerClient> session_controller_client_;
47 std::unique_ptr<SystemTrayClient> system_tray_client_; 48 std::unique_ptr<SystemTrayClient> system_tray_client_;
48 std::unique_ptr<ChromeNewWindowClient> new_window_client_; 49 std::unique_ptr<ChromeNewWindowClient> new_window_client_;
49 std::unique_ptr<VolumeController> volume_controller_; 50 std::unique_ptr<VolumeController> volume_controller_;
50 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; 51 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_;
52 std::unique_ptr<AshInit> ash_init_;
51 53
52 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); 54 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
53 }; 55 };
54 56
55 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 57 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.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