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

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

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_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"
13 #include "base/ref_counted.h" 12 #include "base/ref_counted.h"
14 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
15 #include "chrome/browser/command_updater.h" 14 #include "chrome/browser/command_updater.h"
16 #include "chrome/browser/prefs/pref_member.h" 15 #include "chrome/browser/prefs/pref_member.h"
17 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" 16 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
18 #include "chrome/browser/ui/views/accessible_pane_view.h" 17 #include "chrome/browser/ui/views/accessible_pane_view.h"
19 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 18 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
20 #include "chrome/browser/ui/views/reload_button.h" 19 #include "chrome/browser/ui/views/reload_button.h"
20 #include "ui/base/animation/slide_animation.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
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_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698