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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ui/views/widget/desktop_aura/x11_desktop_handler.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 unified diff | Download patch | Annotate | Revision Log

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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"	5 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"

6	6

7 #include "base/message_loop/message_loop.h"	7 #include "base/message_loop/message_loop.h"

8 #include "ui/aura/env.h"	8 #include "ui/aura/env.h"

9 #include "ui/aura/focus_manager.h"	9 #include "ui/aura/focus_manager.h"

10 #include "ui/aura/root_window.h"	10 #include "ui/aura/root_window.h"

11 #include "ui/base/x/x11_util.h"	11 #include "ui/base/x/x11_util.h"

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

13	12

14 #if !defined(OS_CHROMEOS)	13 #if !defined(OS_CHROMEOS)

15 #include "ui/views/ime/input_method.h"	14 #include "ui/views/ime/input_method.h"

16 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"	15 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"

17 #endif	16 #endif

18	17

19 namespace {	18 namespace {

20	19

21 const char* kAtomsToCache[] = {	20 const char* kAtomsToCache[] = {

22 "_NET_ACTIVE_WINDOW",	21 "_NET_ACTIVE_WINDOW",

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
119	118

120 DesktopRootWindowHostX11* new_host =	119 DesktopRootWindowHostX11* new_host =

121 views::DesktopRootWindowHostX11::GetHostForXID(xid);	120 views::DesktopRootWindowHostX11::GetHostForXID(xid);

122 if (new_host)	121 if (new_host)

123 new_host->HandleNativeWidgetActivationChanged(true);	122 new_host->HandleNativeWidgetActivationChanged(true);

124	123

125 current_window_ = xid;	124 current_window_ = xid;

126 }	125 }

127	126

128 } // namespace views	127 } // namespace views

OLD	NEW