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

Unified Diff: ui/aura/mus/focus_synchronizer.cc

Issue 2500973002: Converts test_wm to use aura (Closed)
Patch Set: cleanup Created 4 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
Index: ui/aura/mus/focus_synchronizer.cc
diff --git a/ui/aura/mus/focus_synchronizer.cc b/ui/aura/mus/focus_synchronizer.cc
index 8f69615ed114e661e44532fe83df35feb6538795..b211315fc9ca0c97d991b01993559d1fe0cd4d51 100644
--- a/ui/aura/mus/focus_synchronizer.cc
+++ b/ui/aura/mus/focus_synchronizer.cc
@@ -33,11 +33,13 @@ void FocusSynchronizer::SetFocusFromServer(WindowMus* window) {
base::AutoReset<bool> focus_reset(&setting_focus_, true);
base::AutoReset<WindowMus*> window_setting_focus_to_reset(
&window_setting_focus_to_, window);
- Env* env = aura::Env::GetInstance();
+ Env* env = Env::GetInstance();
if (window) {
Window* root = window->GetWindow()->GetRootWindow();
+ // The client should provide a focus client for all roots.
+ DCHECK(client::GetFocusClient(root));
if (env->active_focus_client_root() != root)
- env->SetActiveFocusClient(aura::client::GetFocusClient(root), root);
+ env->SetActiveFocusClient(client::GetFocusClient(root), root);
window->GetWindow()->Focus();
} else if (env->active_focus_client()) {
env->active_focus_client()->FocusWindow(nullptr);

Powered by Google App Engine
This is Rietveld 408576698