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: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h

Issue 780713002: Fix remaining WeakPtrFactory ordering problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 // Index of the last local entry (recently closed tab or window) in the 164 // Index of the last local entry (recently closed tab or window) in the
165 // menumodel. 165 // menumodel.
166 int last_local_model_index_; 166 int last_local_model_index_;
167 167
168 gfx::Image default_favicon_; 168 gfx::Image default_favicon_;
169 169
170 base::CancelableTaskTracker local_tab_cancelable_task_tracker_; 170 base::CancelableTaskTracker local_tab_cancelable_task_tracker_;
171 base::CancelableTaskTracker other_devices_tab_cancelable_task_tracker_; 171 base::CancelableTaskTracker other_devices_tab_cancelable_task_tracker_;
172 172
173 base::WeakPtrFactory<RecentTabsSubMenuModel> weak_ptr_factory_;
174
175 // Time the menu is open for until a recent tab is selected. 173 // Time the menu is open for until a recent tab is selected.
176 base::ElapsedTimer menu_opened_timer_; 174 base::ElapsedTimer menu_opened_timer_;
177 175
176 base::WeakPtrFactory<RecentTabsSubMenuModel> weak_ptr_factory_;
177
178 DISALLOW_COPY_AND_ASSIGN(RecentTabsSubMenuModel); 178 DISALLOW_COPY_AND_ASSIGN(RecentTabsSubMenuModel);
179 }; 179 };
180 180
181 #endif // CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_ 181 #endif // CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/session_data_type_controller_unittest.cc ('k') | chrome/browser/ui/views/status_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698