ui/views/widget/desktop_aura/desktop_root_window_host_win.cc - Issue 23874013: Remove old activation code and disable-focus-controller flags

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 23874013: Remove old activation code and disable-focus-controller flags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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

« ash/shelf/shelf_widget_unittest.cc ('K') | « ui/views/widget/desktop_aura/desktop_root_window_host_win.h ('k') | ui/views/widget/desktop_aura/desktop_root_window_host_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

index 6d24adc0fb78e564aeb335b306ee398a7b753088..d81aeb84a9b4c8d70f7811cdd61d019d2a58f52e 100644

--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

@@ -29,7 +29,6 @@

#include "ui/views/corewm/input_method_event_filter.h"

#include "ui/views/corewm/window_animations.h"

#include "ui/views/ime/input_method_bridge.h"

-#include "ui/views/widget/desktop_aura/desktop_activation_client.h"

#include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"

#include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"

#include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h"

@@ -67,10 +66,8 @@ DesktopRootWindowHostWin::DesktopRootWindowHostWin(

}

DesktopRootWindowHostWin::~DesktopRootWindowHostWin() {

- if (corewm::UseFocusControllerOnDesktop()) {

- aura::client::SetFocusClient(root_window_, NULL);

- aura::client::SetActivationClient(root_window_, NULL);

- }

+ aura::client::SetFocusClient(root_window_, NULL);

+ aura::client::SetActivationClient(root_window_, NULL);

}

// static

@@ -128,18 +125,12 @@ aura::RootWindow* DesktopRootWindowHostWin::Init(

desktop_native_widget_aura_->CreateCaptureClient(root_window_);

- if (corewm::UseFocusControllerOnDesktop()) {

- corewm::FocusController* focus_controller =

- new corewm::FocusController(new DesktopFocusRules);

- focus_client_.reset(focus_controller);

- aura::client::SetFocusClient(root_window_, focus_controller);

- aura::client::SetActivationClient(root_window_, focus_controller);

- root_window_->AddPreTargetHandler(focus_controller);

- } else {

- focus_client_.reset(new aura::FocusManager);

- aura::client::SetFocusClient(root_window_, focus_client_.get());

- activation_client_.reset(new DesktopActivationClient(root_window_));

- }

+ corewm::FocusController* focus_controller =

+ new corewm::FocusController(new DesktopFocusRules);

+ focus_client_.reset(focus_controller);

+ aura::client::SetFocusClient(root_window_, focus_controller);

+ aura::client::SetActivationClient(root_window_, focus_controller);

+ root_window_->AddPreTargetHandler(focus_controller);

dispatcher_client_.reset(new DesktopDispatcherClient);

aura::client::SetDispatcherClient(root_window_,