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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/mus/native_widget_mus.cc

Issue 2371113003: Do not give instant focus if a view's toplevelwidget is not active (Closed)
Patch Set: fix test failures Created 4 years, 2 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
« chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc ('K') | « ui/views/focus/focus_manager.cc ('k') | ui/views/view_targeter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/native_widget_mus.cc
diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
index d0b9349b68eba292f6413805bbad5b5d63d54b90..1d73352b0b6c6cea19a42ed80da3a848ca5cd1aa 100644
--- a/ui/views/mus/native_widget_mus.cc
+++ b/ui/views/mus/native_widget_mus.cc
@@ -1095,11 +1095,11 @@ bool NativeWidgetMus::IsVisible() const {
}
void NativeWidgetMus::Activate() {
+ if (!window_)
+ return;
+
static_cast<aura::client::ActivationClient*>(focus_client_.get())
->ActivateWindow(content_);
- // FocusControllerMus should have focused |window_| when |content_| is
- // activated.
- DCHECK(!window_ || window_->HasFocus());
}
void NativeWidgetMus::Deactivate() {
« chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc ('K') | « ui/views/focus/focus_manager.cc ('k') | ui/views/view_targeter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698