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

Side by Side Diff: ui/views/focus/focus_manager.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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/views/focus/accelerator_handler_win.cc ('k') | ui/views/focus/focus_manager_unittest.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/focus/focus_manager.h" 5 #include "ui/views/focus/focus_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "ui/base/accelerator_manager.h" 12 #include "ui/base/accelerator_manager.h"
13 #include "ui/base/keycodes/keyboard_codes.h" 13 #include "ui/base/keycodes/keyboard_codes.h"
14 #include "ui/base/models/accelerator.h" 14 #include "ui/base/models/accelerator.h"
15 #include "ui/views/focus/focus_search.h" 15 #include "ui/views/focus/focus_search.h"
16 #include "ui/views/focus/view_storage.h" 16 #include "ui/views/focus/view_storage.h"
17 #include "ui/views/focus/widget_focus_manager.h" 17 #include "ui/views/focus/widget_focus_manager.h"
18 #include "ui/views/widget/root_view.h"
19 #include "ui/views/widget/widget.h"
18 #include "views/view.h" 20 #include "views/view.h"
19 #include "views/widget/root_view.h"
20 #include "views/widget/widget.h"
21 21
22 namespace views { 22 namespace views {
23 23
24 FocusManager::FocusManager(Widget* widget) 24 FocusManager::FocusManager(Widget* widget)
25 : widget_(widget), 25 : widget_(widget),
26 focused_view_(NULL), 26 focused_view_(NULL),
27 accelerator_manager_(new ui::AcceleratorManager), 27 accelerator_manager_(new ui::AcceleratorManager),
28 focus_change_reason_(kReasonDirectFocusChange), 28 focus_change_reason_(kReasonDirectFocusChange),
29 is_changing_focus_(false) { 29 is_changing_focus_(false) {
30 DCHECK(widget_); 30 DCHECK(widget_);
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 404
405 void FocusManager::AddFocusChangeListener(FocusChangeListener* listener) { 405 void FocusManager::AddFocusChangeListener(FocusChangeListener* listener) {
406 focus_change_listeners_.AddObserver(listener); 406 focus_change_listeners_.AddObserver(listener);
407 } 407 }
408 408
409 void FocusManager::RemoveFocusChangeListener(FocusChangeListener* listener) { 409 void FocusManager::RemoveFocusChangeListener(FocusChangeListener* listener) {
410 focus_change_listeners_.RemoveObserver(listener); 410 focus_change_listeners_.RemoveObserver(listener);
411 } 411 }
412 412
413 } // namespace views 413 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/focus/accelerator_handler_win.cc ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698