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

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

Issue 23851016: Convert zoom callbacks to use CallbackRegistry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge Created 7 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 | Annotate | Revision Log
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 #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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 scoped_ptr<BookmarkSubMenuModel> bookmark_sub_menu_model_; 166 scoped_ptr<BookmarkSubMenuModel> bookmark_sub_menu_model_;
167 167
168 // Recent Tabs submenu. 168 // Recent Tabs submenu.
169 scoped_ptr<RecentTabsSubMenuModel> recent_tabs_sub_menu_model_; 169 scoped_ptr<RecentTabsSubMenuModel> recent_tabs_sub_menu_model_;
170 170
171 ui::AcceleratorProvider* provider_; // weak 171 ui::AcceleratorProvider* provider_; // weak
172 172
173 Browser* browser_; // weak 173 Browser* browser_; // weak
174 TabStripModel* tab_strip_model_; // weak 174 TabStripModel* tab_strip_model_; // weak
175 175
176 content::HostZoomMap::ZoomLevelChangedCallback zoom_callback_; 176 scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
177 content::NotificationRegistrar registrar_; 177 content::NotificationRegistrar registrar_;
178 178
179 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel); 179 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel);
180 }; 180 };
181 181
182 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ 182 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698