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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_VIEWS_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "app/menus/simple_menu_model.h" 11 #include "app/menus/simple_menu_model.h"
12 #include "app/slide_animation.h" 12 #include "app/slide_animation.h"
13 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
14 #include "chrome/browser/back_forward_menu_model.h" 14 #include "chrome/browser/back_forward_menu_model.h"
15 #include "chrome/browser/command_updater.h" 15 #include "chrome/browser/command_updater.h"
16 #include "chrome/browser/pref_member.h" 16 #include "chrome/browser/prefs/pref_member.h"
17 #include "chrome/browser/views/accessible_toolbar_view.h" 17 #include "chrome/browser/views/accessible_toolbar_view.h"
18 #include "chrome/browser/views/location_bar/location_bar_view.h" 18 #include "chrome/browser/views/location_bar/location_bar_view.h"
19 #include "chrome/browser/views/reload_button.h" 19 #include "chrome/browser/views/reload_button.h"
20 #include "views/controls/button/menu_button.h" 20 #include "views/controls/button/menu_button.h"
21 #include "views/controls/menu/menu.h" 21 #include "views/controls/menu/menu.h"
22 #include "views/controls/menu/menu_wrapper.h" 22 #include "views/controls/menu/menu_wrapper.h"
23 #include "views/controls/menu/view_menu_delegate.h" 23 #include "views/controls/menu/view_menu_delegate.h"
24 #include "views/view.h" 24 #include "views/view.h"
25 25
26 class BrowserActionsContainer; 26 class BrowserActionsContainer;
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 207
208 // If non-null the destructor sets this to true. This is set to a non-null 208 // If non-null the destructor sets this to true. This is set to a non-null
209 // while the menu is showing and used to detect if the menu was deleted while 209 // while the menu is showing and used to detect if the menu was deleted while
210 // running. 210 // running.
211 bool* destroyed_flag_; 211 bool* destroyed_flag_;
212 212
213 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 213 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
214 }; 214 };
215 215
216 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 216 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698