| OLD | NEW |
| 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_UI_VIEWS_TOOLBAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "app/menus/accelerator.h" | 11 #include "app/menus/accelerator.h" |
| 12 #include "app/slide_animation.h" | 12 #include "app/slide_animation.h" |
| 13 #include "base/ref_counted.h" | 13 #include "base/ref_counted.h" |
| 14 #include "base/scoped_ptr.h" | 14 #include "base/scoped_ptr.h" |
| 15 #include "chrome/browser/back_forward_menu_model.h" | |
| 16 #include "chrome/browser/command_updater.h" | 15 #include "chrome/browser/command_updater.h" |
| 17 #include "chrome/browser/prefs/pref_member.h" | 16 #include "chrome/browser/prefs/pref_member.h" |
| 18 #include "chrome/browser/views/accessible_pane_view.h" | 17 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" |
| 19 #include "chrome/browser/views/location_bar/location_bar_view.h" | 18 #include "chrome/browser/ui/views/accessible_pane_view.h" |
| 20 #include "chrome/browser/views/reload_button.h" | 19 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 20 #include "chrome/browser/ui/views/reload_button.h" |
| 21 #include "views/controls/button/menu_button.h" | 21 #include "views/controls/button/menu_button.h" |
| 22 #include "views/controls/menu/menu.h" | 22 #include "views/controls/menu/menu.h" |
| 23 #include "views/controls/menu/menu_wrapper.h" | 23 #include "views/controls/menu/menu_wrapper.h" |
| 24 #include "views/controls/menu/view_menu_delegate.h" | 24 #include "views/controls/menu/view_menu_delegate.h" |
| 25 #include "views/view.h" | 25 #include "views/view.h" |
| 26 | 26 |
| 27 class BrowserActionsContainer; | 27 class BrowserActionsContainer; |
| 28 class Browser; | 28 class Browser; |
| 29 class Profile; | 29 class Profile; |
| 30 #if defined(OS_CHROMEOS) | 30 #if defined(OS_CHROMEOS) |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 | 222 |
| 223 // If non-null the destructor sets this to true. This is set to a non-null | 223 // If non-null the destructor sets this to true. This is set to a non-null |
| 224 // while the menu is showing and used to detect if the menu was deleted while | 224 // while the menu is showing and used to detect if the menu was deleted while |
| 225 // running. | 225 // running. |
| 226 bool* destroyed_flag_; | 226 bool* destroyed_flag_; |
| 227 | 227 |
| 228 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 228 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 229 }; | 229 }; |
| 230 | 230 |
| 231 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 231 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |