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

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h

Issue 1412093006: components: Add Exosphere component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on improved shared memory support Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
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..005ec1600ea48a3c5218c3796006d2aac50622c0 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"
+namespace exo {
+class Display;
+#if defined(OS_LINUX)
+namespace wayland {
+class Server;
+}
+#endif
+}
+
class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
public:
ChromeBrowserMainExtraPartsAsh();
@@ -20,6 +30,13 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
void PostMainMessageLoopRun() override;
private:
+ scoped_ptr<exo::Display> exo_display_;
+#if defined(OS_LINUX)
+ scoped_ptr<exo::wayland::Server> wayland_server_;
+ class WaylandWatcher;
+ scoped_ptr<WaylandWatcher> wayland_watcher_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
};

Powered by Google App Engine
This is Rietveld 408576698