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

Side by Side Diff: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h

Issue 1182493009: Wrench menu reorg phase 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge error Created 5 years, 5 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 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 void TabRestoreServiceChanged(TabRestoreService* service) override; 137 void TabRestoreServiceChanged(TabRestoreService* service) override;
138 void TabRestoreServiceDestroyed(TabRestoreService* service) override; 138 void TabRestoreServiceDestroyed(TabRestoreService* service) override;
139 139
140 Browser* browser_; // Weak. 140 Browser* browser_; // Weak.
141 141
142 sync_driver::OpenTabsUIDelegate* open_tabs_delegate_; // Weak. 142 sync_driver::OpenTabsUIDelegate* open_tabs_delegate_; // Weak.
143 143
144 // Accelerator for reopening last closed tab. 144 // Accelerator for reopening last closed tab.
145 ui::Accelerator reopen_closed_tab_accelerator_; 145 ui::Accelerator reopen_closed_tab_accelerator_;
146 146
147 // Accelerator for showing history.
148 ui::Accelerator show_history_accelerator_;
149
147 // Navigation items for local recently closed tabs. The |command_id| for 150 // Navigation items for local recently closed tabs. The |command_id| for
148 // these is set to |kFirstLocalTabCommandId| plus the index into the vector. 151 // these is set to |kFirstLocalTabCommandId| plus the index into the vector.
149 // Upon invocation of the menu, the navigation information is retrieved from 152 // Upon invocation of the menu, the navigation information is retrieved from
150 // |local_tab_navigation_items_| and used to navigate to the item specified. 153 // |local_tab_navigation_items_| and used to navigate to the item specified.
151 TabNavigationItems local_tab_navigation_items_; 154 TabNavigationItems local_tab_navigation_items_;
152 155
153 // Similar to |local_tab_navigation_items_| except the tabs are opened tabs 156 // Similar to |local_tab_navigation_items_| except the tabs are opened tabs
154 // from other devices, and the first |command_id| is 157 // from other devices, and the first |command_id| is
155 // |kFirstOtherDevicesTabCommandId|. 158 // |kFirstOtherDevicesTabCommandId|.
156 TabNavigationItems other_devices_tab_navigation_items_; 159 TabNavigationItems other_devices_tab_navigation_items_;
(...skipping 15 matching lines...) Expand all
172 175
173 // Time the menu is open for until a recent tab is selected. 176 // Time the menu is open for until a recent tab is selected.
174 base::ElapsedTimer menu_opened_timer_; 177 base::ElapsedTimer menu_opened_timer_;
175 178
176 base::WeakPtrFactory<RecentTabsSubMenuModel> weak_ptr_factory_; 179 base::WeakPtrFactory<RecentTabsSubMenuModel> weak_ptr_factory_;
177 180
178 DISALLOW_COPY_AND_ASSIGN(RecentTabsSubMenuModel); 181 DISALLOW_COPY_AND_ASSIGN(RecentTabsSubMenuModel);
179 }; 182 };
180 183
181 #endif // CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_ 184 #endif // CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698