[Merge] Make mouse buttons 8 - 11 navigate forward and back in history

chrome/browser/ui/views/frame/browser_frame.cc

Index: chrome/browser/ui/views/frame/browser_frame.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index a29497aebb40d807141277bd78ebff1ca085db59..2752e42e2619ba3a380409d48b0dfbfbd222284d 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -33,8 +33,8 @@
 #include "ash/shell.h"
 #endif
 
-#if defined(USE_X11)
-#include "chrome/browser/ui/views/frame/browser_command_handler_x11.h"
+#if defined(OS_LINUX)
+#include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -82,8 +82,8 @@ void BrowserFrame::InitBrowserFrame() {
     non_client_view()->set_context_menu_controller(this);
   }
 
-#if defined(USE_X11)
-  browser_command_handler_.reset(new BrowserCommandHandlerX11(browser_view_));
+#if defined(OS_LINUX)
+  browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_));
 #endif
 }