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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/focus/focus_manager_unittest.cc

Issue 11299219: Rework FocusManager as FocusClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « ui/views/controls/native/native_view_host_aura.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/focus_manager_unittest.cc
===================================================================
--- ui/views/focus/focus_manager_unittest.cc (revision 169818)
+++ ui/views/focus/focus_manager_unittest.cc (working copy)
@@ -17,7 +17,7 @@
#include "ui/views/widget/widget.h"
#if defined(USE_AURA)
-#include "ui/aura/focus_manager.h"
+#include "ui/aura/client/focus_client.h"
#include "ui/aura/window.h"
#else
#include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
@@ -28,7 +28,7 @@
void FocusNativeView(gfx::NativeView view) {
#if defined(USE_AURA)
- view->GetFocusManager()->SetFocusedWindow(view, NULL);
+ aura::client::GetFocusClient(view)->FocusWindow(view, NULL);
#elif defined(OS_WIN)
SetFocus(view);
#else
« no previous file with comments | « ui/views/controls/native/native_view_host_aura.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698