| Index: chrome/browser/ui/views/frame/browser_view.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
| index cd9e8714679e1bcae2df42bad6388e5cdba87b84..2a039be8705239dee42cf3afbdd733aeb82aa7fd 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -116,6 +116,9 @@
|
| #include "grit/ui_strings.h"
|
| #include "grit/webkit_resources.h"
|
| #include "ui/accessibility/ax_view_state.h"
|
| +#include "ui/aura/client/window_tree_client.h"
|
| +#include "ui/aura/window.h"
|
| +#include "ui/aura/window_tree_host.h"
|
| #include "ui/base/accelerators/accelerator.h"
|
| #include "ui/base/hit_test.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -125,6 +128,7 @@
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/color_utils.h"
|
| #include "ui/gfx/rect_conversions.h"
|
| +#include "ui/gfx/screen.h"
|
| #include "ui/gfx/sys_color_change_listener.h"
|
| #include "ui/views/controls/button/menu_button.h"
|
| #include "ui/views/controls/textfield/textfield.h"
|
| @@ -145,13 +149,6 @@
|
| #include "chrome/browser/ui/ash/ash_util.h"
|
| #endif
|
|
|
| -#if defined(USE_AURA)
|
| -#include "ui/aura/client/window_tree_client.h"
|
| -#include "ui/aura/window.h"
|
| -#include "ui/aura/window_tree_host.h"
|
| -#include "ui/gfx/screen.h"
|
| -#endif
|
| -
|
| #if defined(OS_WIN)
|
| #include "base/win/windows_version.h"
|
| #include "chrome/browser/jumplist_win.h"
|
| @@ -2296,12 +2293,8 @@ void BrowserView::InitHangMonitor() {
|
| pref_service->GetInteger(prefs::kPluginMessageResponseTimeout);
|
| int hung_plugin_detect_freq =
|
| pref_service->GetInteger(prefs::kHungPluginDetectFrequency);
|
| -#if defined(USE_AURA)
|
| HWND window = GetWidget()->GetNativeView()->GetHost()->
|
| GetAcceleratedWidget();
|
| -#else
|
| - HWND window = GetWidget()->GetNativeView();
|
| -#endif
|
| if ((hung_plugin_detect_freq > 0) &&
|
| hung_window_detector_.Initialize(window,
|
| plugin_message_response_timeout)) {
|
| @@ -2516,11 +2509,7 @@ bool BrowserView::DoCutCopyPasteForWebContents(
|
| gfx::NativeView native_view = contents->GetView()->GetContentNativeView();
|
| if (!native_view)
|
| return false;
|
| -#if defined(USE_AURA)
|
| if (native_view->HasFocus()) {
|
| -#elif defined(OS_WIN)
|
| - if (native_view == ::GetFocus()) {
|
| -#endif
|
| (contents->*method)();
|
| return true;
|
| }
|
|
|