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

Side by Side Diff: ui/wm/core/base_focus_rules.cc

Issue 589413002: Fix WeakPtrFactory member ordering in ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unwanted header inclusions Created 6 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
« no previous file with comments | « ui/views/widget/native_widget_aura.cc ('k') | ui/wm/core/shadow_controller.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/wm/core/base_focus_rules.h" 5 #include "ui/wm/core/base_focus_rules.h"
6 6
7 #include "ui/aura/client/focus_client.h" 7 #include "ui/aura/client/focus_client.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/aura/window_event_dispatcher.h"
10 #include "ui/wm/core/window_modality_controller.h" 9 #include "ui/wm/core/window_modality_controller.h"
11 #include "ui/wm/core/window_util.h" 10 #include "ui/wm/core/window_util.h"
12 #include "ui/wm/public/activation_delegate.h" 11 #include "ui/wm/public/activation_delegate.h"
13 12
14 namespace wm { 13 namespace wm {
15 namespace { 14 namespace {
16 15
17 aura::Window* GetFocusedWindow(aura::Window* context) { 16 aura::Window* GetFocusedWindow(aura::Window* context) {
18 aura::client::FocusClient* focus_client = 17 aura::client::FocusClient* focus_client =
19 aura::client::GetFocusClient(context); 18 aura::client::GetFocusClient(context);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 aura::Window* cur = *rit; 185 aura::Window* cur = *rit;
187 if (cur == ignore) 186 if (cur == ignore)
188 continue; 187 continue;
189 if (CanActivateWindow(cur)) 188 if (CanActivateWindow(cur))
190 return cur; 189 return cur;
191 } 190 }
192 return NULL; 191 return NULL;
193 } 192 }
194 193
195 } // namespace wm 194 } // namespace wm
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_aura.cc ('k') | ui/wm/core/shadow_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698