| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_CHROME_BROWSER_MAIN_EXTRA_PARTS_EXO_H_ | 5 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_EXO_H_ |
| 6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_EXO_H_ | 6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_EXO_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 namespace arc { | 21 namespace arc { |
| 22 class ArcNotificationSurfaceManager; | 22 class ArcNotificationSurfaceManager; |
| 23 } | 23 } |
| 24 | 24 |
| 25 class ChromeBrowserMainExtraPartsExo : public ChromeBrowserMainExtraParts { | 25 class ChromeBrowserMainExtraPartsExo : public ChromeBrowserMainExtraParts { |
| 26 public: | 26 public: |
| 27 ChromeBrowserMainExtraPartsExo(); | 27 ChromeBrowserMainExtraPartsExo(); |
| 28 ~ChromeBrowserMainExtraPartsExo() override; | 28 ~ChromeBrowserMainExtraPartsExo() override; |
| 29 | 29 |
| 30 // Overridden from ChromeBrowserMainExtraParts: | 30 // Overridden from ChromeBrowserMainExtraParts: |
| 31 void ServiceManagerConnectionStarted( |
| 32 content::ServiceManagerConnection* connection) override; |
| 31 void PreProfileInit() override; | 33 void PreProfileInit() override; |
| 32 void PostMainMessageLoopRun() override; | 34 void PostMainMessageLoopRun() override; |
| 33 | 35 |
| 34 private: | 36 private: |
| 35 std::unique_ptr<arc::ArcNotificationSurfaceManager> | 37 std::unique_ptr<arc::ArcNotificationSurfaceManager> |
| 36 arc_notification_surface_manager_; | 38 arc_notification_surface_manager_; |
| 37 std::unique_ptr<exo::WMHelper> wm_helper_; | 39 std::unique_ptr<exo::WMHelper> wm_helper_; |
| 38 std::unique_ptr<exo::Display> display_; | 40 std::unique_ptr<exo::Display> display_; |
| 39 std::unique_ptr<exo::wayland::Server> wayland_server_; | 41 std::unique_ptr<exo::wayland::Server> wayland_server_; |
| 40 class WaylandWatcher; | 42 class WaylandWatcher; |
| 41 std::unique_ptr<WaylandWatcher> wayland_watcher_; | 43 std::unique_ptr<WaylandWatcher> wayland_watcher_; |
| 42 | 44 |
| 43 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsExo); | 45 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsExo); |
| 44 }; | 46 }; |
| 45 | 47 |
| 46 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_EXO_H_ | 48 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_EXO_H_ |
| OLD | NEW |