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

Side by Side Diff: ui/views/widget/desktop_aura/x11_desktop_handler.cc

Issue 26116008: Remove old FocusManager code from Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
10 #include "ui/aura/root_window.h" 9 #include "ui/aura/root_window.h"
11 #include "ui/base/x/x11_util.h" 10 #include "ui/base/x/x11_util.h"
12 11
13 #if !defined(OS_CHROMEOS) 12 #if !defined(OS_CHROMEOS)
14 #include "ui/views/ime/input_method.h" 13 #include "ui/views/ime/input_method.h"
15 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" 14 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
16 #endif 15 #endif
17 16
18 namespace { 17 namespace {
19 18
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 117
119 DesktopRootWindowHostX11* new_host = 118 DesktopRootWindowHostX11* new_host =
120 views::DesktopRootWindowHostX11::GetHostForXID(xid); 119 views::DesktopRootWindowHostX11::GetHostForXID(xid);
121 if (new_host) 120 if (new_host)
122 new_host->HandleNativeWidgetActivationChanged(true); 121 new_host->HandleNativeWidgetActivationChanged(true);
123 122
124 current_window_ = xid; 123 current_window_ = xid;
125 } 124 }
126 125
127 } // namespace views 126 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698