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

Unified Diff: chrome/browser/ui/views/frame/browser_command_handler_x11.cc

Issue 697223003: MacViews: Get chrome/browser/ui/views/frame to compile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@constrained
Patch Set: Fix MacViews build Created 6 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/frame/browser_command_handler_x11.cc
diff --git a/chrome/browser/ui/views/frame/browser_command_handler_x11.cc b/chrome/browser/ui/views/frame/browser_command_handler_x11.cc
index ce37fcc47799ad2138f4e943214cead8fd23c3ea..f70cba0570d9cf470bb796f85a58622f5360e6bc 100644
--- a/chrome/browser/ui/views/frame/browser_command_handler_x11.cc
+++ b/chrome/browser/ui/views/frame/browser_command_handler_x11.cc
@@ -7,16 +7,23 @@
#include <X11/Xlib.h>
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/web_contents.h"
+#include "ui/aura/window.h"
#include "ui/events/event.h"
#include "ui/events/event_utils.h"
-BrowserCommandHandlerX11::BrowserCommandHandlerX11(Browser* browser)
- : browser_(browser) {}
+BrowserCommandHandlerX11::BrowserCommandHandlerX11(Browser* browser,
+ gfx::NativeWindow window)
+ : browser_(browser), window_(window) {
+ window->AddPreTargetHandler(this);
+}
-BrowserCommandHandlerX11::~BrowserCommandHandlerX11() {}
+BrowserCommandHandlerX11::~BrowserCommandHandlerX11() {
+ window_->RemovePreTargetHandler(this);
+}
void BrowserCommandHandlerX11::OnMouseEvent(ui::MouseEvent* event) {
if (event->type() != ui::ET_MOUSE_PRESSED)

Powered by Google App Engine
This is Rietveld 408576698