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

Side by Side Diff: ash/common/focus_cycler.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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 | « ash/common/focus_cycler.h ('k') | ash/common/gpu_support.h » ('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 "ash/focus_cycler.h" 5 #include "ash/common/focus_cycler.h"
6 6
7 #include "ash/common/wm_shell.h"
8 #include "ash/common/wm_window.h"
7 #include "ash/wm/mru_window_tracker.h" 9 #include "ash/wm/mru_window_tracker.h"
8 #include "ash/wm/window_state.h" 10 #include "ash/wm/window_state.h"
9 #include "ash/wm_shell.h"
10 #include "ash/wm_window.h"
11 #include "ui/views/accessible_pane_view.h" 11 #include "ui/views/accessible_pane_view.h"
12 #include "ui/views/focus/focus_search.h" 12 #include "ui/views/focus/focus_search.h"
13 #include "ui/views/widget/widget.h" 13 #include "ui/views/widget/widget.h"
14 #include "ui/wm/public/activation_client.h" 14 #include "ui/wm/public/activation_client.h"
15 15
16 namespace ash { 16 namespace ash {
17 17
18 namespace { 18 namespace {
19 19
20 bool HasFocusableWindow() { 20 bool HasFocusableWindow() {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 bool FocusCycler::FocusWidget(views::Widget* widget) { 105 bool FocusCycler::FocusWidget(views::Widget* widget) {
106 // Note: It is not necessary to set the focus directly to the pane since that 106 // Note: It is not necessary to set the focus directly to the pane since that
107 // will be taken care of by the widget activation. 107 // will be taken care of by the widget activation.
108 widget_activating_ = widget; 108 widget_activating_ = widget;
109 widget->Activate(); 109 widget->Activate();
110 widget_activating_ = NULL; 110 widget_activating_ = NULL;
111 return widget->IsActive(); 111 return widget->IsActive();
112 } 112 }
113 113
114 } // namespace ash 114 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/focus_cycler.h ('k') | ash/common/gpu_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698