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

Side by Side Diff: ui/views/accessible_pane_view.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, 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
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/accessible_pane_view.h" 5 #include "ui/views/accessible_pane_view.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "ui/accessibility/ax_view_state.h" 8 #include "ui/accessibility/ax_view_state.h"
9 #include "ui/views/focus/focus_search.h" 9 #include "ui/views/focus/focus_search.h"
10 #include "ui/views/focus/view_storage.h" 10 #include "ui/views/focus/view_storage.h"
(...skipping 25 matching lines...) Expand all
36 } 36 }
37 37
38 private: 38 private:
39 AccessiblePaneView* accessible_pane_view_; 39 AccessiblePaneView* accessible_pane_view_;
40 DISALLOW_COPY_AND_ASSIGN(AccessiblePaneViewFocusSearch); 40 DISALLOW_COPY_AND_ASSIGN(AccessiblePaneViewFocusSearch);
41 }; 41 };
42 42
43 AccessiblePaneView::AccessiblePaneView() 43 AccessiblePaneView::AccessiblePaneView()
44 : pane_has_focus_(false), 44 : pane_has_focus_(false),
45 allow_deactivate_on_esc_(false), 45 allow_deactivate_on_esc_(false),
46 method_factory_(this),
47 focus_manager_(NULL), 46 focus_manager_(NULL),
48 home_key_(ui::VKEY_HOME, ui::EF_NONE), 47 home_key_(ui::VKEY_HOME, ui::EF_NONE),
49 end_key_(ui::VKEY_END, ui::EF_NONE), 48 end_key_(ui::VKEY_END, ui::EF_NONE),
50 escape_key_(ui::VKEY_ESCAPE, ui::EF_NONE), 49 escape_key_(ui::VKEY_ESCAPE, ui::EF_NONE),
51 left_key_(ui::VKEY_LEFT, ui::EF_NONE), 50 left_key_(ui::VKEY_LEFT, ui::EF_NONE),
52 right_key_(ui::VKEY_RIGHT, ui::EF_NONE) { 51 right_key_(ui::VKEY_RIGHT, ui::EF_NONE),
52 method_factory_(this) {
53 focus_search_.reset(new AccessiblePaneViewFocusSearch(this)); 53 focus_search_.reset(new AccessiblePaneViewFocusSearch(this));
54 last_focused_view_storage_id_ = ViewStorage::GetInstance()->CreateStorageID(); 54 last_focused_view_storage_id_ = ViewStorage::GetInstance()->CreateStorageID();
55 } 55 }
56 56
57 AccessiblePaneView::~AccessiblePaneView() { 57 AccessiblePaneView::~AccessiblePaneView() {
58 if (pane_has_focus_) { 58 if (pane_has_focus_) {
59 focus_manager_->RemoveFocusChangeListener(this); 59 focus_manager_->RemoveFocusChangeListener(this);
60 } 60 }
61 } 61 }
62 62
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 DCHECK(pane_has_focus_); 253 DCHECK(pane_has_focus_);
254 return NULL; 254 return NULL;
255 } 255 }
256 256
257 views::View* AccessiblePaneView::GetFocusTraversableParentView() { 257 views::View* AccessiblePaneView::GetFocusTraversableParentView() {
258 DCHECK(pane_has_focus_); 258 DCHECK(pane_has_focus_);
259 return NULL; 259 return NULL;
260 } 260 }
261 261
262 } // namespace views 262 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/accessible_pane_view.h ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698