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

Unified Diff: ash/shell/content_client/shell_browser_main_parts.h

Issue 205253003: [master] x11: Move X event handling out of the message-pump. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-merge Created 6 years, 9 months 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
« no previous file with comments | « ash/drag_drop/drag_drop_interactive_uitest.cc ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/content_client/shell_browser_main_parts.h
diff --git a/ash/shell/content_client/shell_browser_main_parts.h b/ash/shell/content_client/shell_browser_main_parts.h
index 0e07cbf24bc6850985f5f60a6916009b9bcee68d..b765f07aa90a51f7ba9106f4e3448319ba2016bf 100644
--- a/ash/shell/content_client/shell_browser_main_parts.h
+++ b/ash/shell/content_client/shell_browser_main_parts.h
@@ -22,6 +22,10 @@ namespace net {
class NetLog;
}
+namespace ui {
+class PlatformEventSource;
+}
+
namespace wm {
class WMState;
}
@@ -56,6 +60,7 @@ class ShellBrowserMainParts : public content::BrowserMainParts {
scoped_ptr<ash::shell::WindowWatcher> window_watcher_;
ShellDelegateImpl* delegate_; // owned by Shell
scoped_ptr<wm::WMState> wm_state_;
+ scoped_ptr<ui::PlatformEventSource> event_source_;
DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
};
« no previous file with comments | « ash/drag_drop/drag_drop_interactive_uitest.cc ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698