| Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h
|
| diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h
|
| index 36c6bab6c974ec6a9d5d35dcb99cfd78cc38db53..f961c606d774e0ae3d945361dd2a65aad8b5cdeb 100644
|
| --- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h
|
| +++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h
|
| @@ -22,6 +22,7 @@ class SessionControllerClient;
|
| class SystemTrayClient;
|
| class VolumeController;
|
| class VpnListForwarder;
|
| +class WindowPropertyRelay;
|
|
|
| // Browser initialization for Ash. Only runs on Chrome OS.
|
| // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS.
|
| @@ -32,6 +33,8 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
|
| ~ChromeBrowserMainExtraPartsAsh() override;
|
|
|
| // Overridden from ChromeBrowserMainExtraParts:
|
| + void ServiceManagerConnectionStarted(
|
| + content::ServiceManagerConnection* connection) override;
|
| void PreProfileInit() override;
|
| void PostProfileInit() override;
|
| void PostMainMessageLoopRun() override;
|
| @@ -50,6 +53,7 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
|
| std::unique_ptr<ChromeNewWindowClient> new_window_client_;
|
| std::unique_ptr<VolumeController> volume_controller_;
|
| std::unique_ptr<VpnListForwarder> vpn_list_forwarder_;
|
| + std::unique_ptr<WindowPropertyRelay> window_property_relay_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
|
| };
|
|
|