Chromium Code Reviews| 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 b72a8efb56707d51bba6a16eec76f3a7c2c59dad..3c56922505a124d1eeb02c1f75a5a53f91ad2c6e 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 |
| @@ -7,8 +7,18 @@ |
| #include "base/basictypes.h" |
| #include "base/compiler_specific.h" |
| +#include "base/memory/scoped_ptr.h" |
| #include "chrome/browser/chrome_browser_main_extra_parts.h" |
| +#if defined(ENABLE_WAYLAND_SERVER) |
| +namespace exo { |
| +class Display; |
| +namespace wayland { |
| +class Server; |
| +} |
| +} |
| +#endif |
| + |
| class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { |
| public: |
| ChromeBrowserMainExtraPartsAsh(); |
| @@ -20,6 +30,13 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { |
| void PostMainMessageLoopRun() override; |
| private: |
| +#if defined(ENABLE_WAYLAND_SERVER) |
| + scoped_ptr<exo::Display> exo_display_; |
|
sky
2015/11/18 21:01:21
Does this code need to be in ChromeBrowserMainExtr
reveman
2015/11/18 23:55:18
Sure, moved it to ChromeBrowserMainExtraPartsExo i
|
| + scoped_ptr<exo::wayland::Server> wayland_server_; |
| + class WaylandWatcher; |
| + scoped_ptr<WaylandWatcher> wayland_watcher_; |
| +#endif |
| + |
| DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); |
| }; |