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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 15 matching lines @@
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/native_widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/session/session_state_delegate.h"
 #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
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
 BrowserFrame::BrowserFrame(BrowserView* browser_view)
     : native_browser_frame_(nullptr),
       root_view_(nullptr),
       browser_frame_view_(nullptr),
       browser_view_(browser_view),
@@ skipping 27 matching lines @@
                                              &params.bounds,
                                              &params.show_state);
   }
   Init(params);
 
   if (!native_browser_frame_->UsesNativeSystemMenu()) {
     DCHECK(non_client_view());
     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
 }
 
 void BrowserFrame::SetThemeProvider(scoped_ptr<ui::ThemeProvider> provider) {
   owned_theme_provider_ = provider.Pass();
   theme_provider_ = owned_theme_provider_.get();
 }
 
 int BrowserFrame::GetMinimizeButtonOffset() const {
   return native_browser_frame_->GetMinimizeButtonOffset();
@@ skipping 144 matching lines @@
   return browser_frame_view_->avatar_button();
 }
 
 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() {
   return browser_frame_view_->new_avatar_button();
 }
 
 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() {
   return !IsMaximized();
 }