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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_view.h

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
11 #include "base/prefs/pref_member.h"
12 #include "chrome/browser/command_observer.h" 11 #include "chrome/browser/command_observer.h"
13 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h" 12 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"
14 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" 13 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
15 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 14 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
15 #include "components/prefs/pref_member.h"
16 #include "ui/base/accelerators/accelerator.h" 16 #include "ui/base/accelerators/accelerator.h"
17 #include "ui/views/accessible_pane_view.h" 17 #include "ui/views/accessible_pane_view.h"
18 #include "ui/views/controls/button/menu_button.h" 18 #include "ui/views/controls/button/menu_button.h"
19 #include "ui/views/controls/button/menu_button_listener.h" 19 #include "ui/views/controls/button/menu_button_listener.h"
20 #include "ui/views/view.h" 20 #include "ui/views/view.h"
21 21
22 class AppMenuButton; 22 class AppMenuButton;
23 class BackButton; 23 class BackButton;
24 class Browser; 24 class Browser;
25 class BrowserActionsContainer; 25 class BrowserActionsContainer;
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 // The display mode used when laying out the toolbar. 225 // The display mode used when laying out the toolbar.
226 DisplayMode display_mode_; 226 DisplayMode display_mode_;
227 227
228 content::NotificationRegistrar registrar_; 228 content::NotificationRegistrar registrar_;
229 229
230 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 230 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
231 }; 231 };
232 232
233 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 233 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/home_button.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698