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

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

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 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
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;
}
« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_host.cc ('k') | chrome/browser/ui/views/keyboard_access_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698