OLD | NEW |
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 #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ | 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ |
6 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ | 6 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ |
7 | 7 |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 scoped_ptr<BookmarkSubMenuModel> bookmark_sub_menu_model_; | 185 scoped_ptr<BookmarkSubMenuModel> bookmark_sub_menu_model_; |
186 | 186 |
187 // Recent Tabs submenu. | 187 // Recent Tabs submenu. |
188 scoped_ptr<RecentTabsSubMenuModel> recent_tabs_sub_menu_model_; | 188 scoped_ptr<RecentTabsSubMenuModel> recent_tabs_sub_menu_model_; |
189 | 189 |
190 ui::AcceleratorProvider* provider_; // weak | 190 ui::AcceleratorProvider* provider_; // weak |
191 | 191 |
192 Browser* browser_; // weak | 192 Browser* browser_; // weak |
193 TabStripModel* tab_strip_model_; // weak | 193 TabStripModel* tab_strip_model_; // weak |
194 | 194 |
195 scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_; | 195 scoped_ptr<content::HostZoomMap::Subscription> content_zoom_subscription_; |
| 196 scoped_ptr<content::HostZoomMap::Subscription> browser_zoom_subscription_; |
196 content::NotificationRegistrar registrar_; | 197 content::NotificationRegistrar registrar_; |
197 | 198 |
198 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel); | 199 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel); |
199 }; | 200 }; |
200 | 201 |
201 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ | 202 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ |
OLD | NEW |