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

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 2924873007: Don't activate aura::Window on creation from DesktopNativeWidgetAura if NativeWidgetDelegate prohib… (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « no previous file | ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index 0bc292f22465cf8d6adb82e7eb21c2a4f8e2aa48..b8abf389bbb493b3da35f77a9b5e2862d31ad230 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -500,9 +500,6 @@ void DesktopNativeWidgetAura::InitNativeWidget(
if (drag_drop_client_)
aura::client::SetDragDropClient(host_->window(), drag_drop_client_.get());
- static_cast<aura::client::FocusClient*>(focus_client_.get())->
sky 2017/06/08 19:45:32 Shouldn't this code still focus the window for the
vasilii 2017/06/09 12:36:45 Done. Moved the call despite I don't see the place
- FocusWindow(content_window_);
-
OnHostResized(host());
host_->AddObserver(this);
@@ -537,9 +534,8 @@ void DesktopNativeWidgetAura::InitNativeWidget(
event_client_.reset(new DesktopEventClient);
aura::client::SetEventClient(host_->window(), event_client_.get());
- aura::client::GetFocusClient(content_window_)->FocusWindow(content_window_);
-
wm::SetActivationDelegate(content_window_, this);
+ aura::client::GetFocusClient(content_window_)->FocusWindow(content_window_);
shadow_controller_.reset(
new wm::ShadowController(wm::GetActivationClient(host_->window())));
« no previous file with comments | « no previous file | ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698