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

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

Issue 2545723003: ash: Add SessionController/Client mojo interfaces (Closed)
Patch Set: use a default to fix null avatar image failures 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 ChromeLauncherControllerMus; 13 class ChromeLauncherControllerMus;
14 class ImmersiveContextMus; 14 class ImmersiveContextMus;
15 class ImmersiveHandlerFactoryMus; 15 class ImmersiveHandlerFactoryMus;
16 class SessionControllerClient;
16 class SystemTrayClient; 17 class SystemTrayClient;
17 class VpnListForwarder; 18 class VpnListForwarder;
18 19
19 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { 20 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
20 public: 21 public:
21 ChromeBrowserMainExtraPartsAsh(); 22 ChromeBrowserMainExtraPartsAsh();
22 ~ChromeBrowserMainExtraPartsAsh() override; 23 ~ChromeBrowserMainExtraPartsAsh() override;
23 24
24 // Overridden from ChromeBrowserMainExtraParts: 25 // Overridden from ChromeBrowserMainExtraParts:
25 void PreProfileInit() override; 26 void PreProfileInit() override;
26 void PostProfileInit() override; 27 void PostProfileInit() override;
27 void PostMainMessageLoopRun() override; 28 void PostMainMessageLoopRun() override;
28 29
29 private: 30 private:
30 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_; 31 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_;
31 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 32 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
32 std::unique_ptr<ImmersiveContextMus> immersive_context_; 33 std::unique_ptr<ImmersiveContextMus> immersive_context_;
33 std::unique_ptr<SystemTrayClient> system_tray_client_; 34 std::unique_ptr<SystemTrayClient> system_tray_client_;
34 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; 35 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_;
36 std::unique_ptr<SessionControllerClient> session_controller_client_;
James Cook 2016/12/01 23:01:44 nit: alphabetize unless order matters
xiyuan 2016/12/06 00:46:34 Done.
35 37
36 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); 38 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
37 }; 39 };
38 40
39 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ 41 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698