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

Side by Side Diff: ui/views/controls/native/native_view_host_aura.cc

Issue 29883002: Attempt to re-land FocusManager removal from Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable test with note. 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
« no previous file with comments | « ui/shell/minimal_shell.cc ('k') | ui/views/corewm/compound_event_filter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/controls/native/native_view_host_aura.h" 5 #include "ui/views/controls/native/native_view_host_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/aura/focus_manager.h" 8 #include "ui/aura/client/focus_client.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/views/controls/native/native_view_host.h" 10 #include "ui/views/controls/native/native_view_host.h"
11 #include "ui/views/view_constants_aura.h" 11 #include "ui/views/view_constants_aura.h"
12 #include "ui/views/widget/widget.h" 12 #include "ui/views/widget/widget.h"
13 13
14 namespace views { 14 namespace views {
15 15
16 NativeViewHostAura::NativeViewHostAura(NativeViewHost* host) 16 NativeViewHostAura::NativeViewHostAura(NativeViewHost* host)
17 : host_(host), 17 : host_(host),
18 installed_clip_(false) { 18 installed_clip_(false) {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 host_->NativeViewDestroyed(); 105 host_->NativeViewDestroyed();
106 } 106 }
107 107
108 // static 108 // static
109 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper( 109 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
110 NativeViewHost* host) { 110 NativeViewHost* host) {
111 return new NativeViewHostAura(host); 111 return new NativeViewHostAura(host);
112 } 112 }
113 113
114 } // namespace views 114 } // namespace views
OLDNEW
« no previous file with comments | « ui/shell/minimal_shell.cc ('k') | ui/views/corewm/compound_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698