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

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

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 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 | 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_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 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/observer_list.h" 12 #include "base/observer_list.h"
13 #include "base/prefs/pref_member.h" 13 #include "base/prefs/pref_member.h"
14 #include "chrome/browser/command_observer.h" 14 #include "chrome/browser/command_observer.h"
15 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" 15 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
17 #include "chrome/browser/ui/views/reload_button.h" 17 #include "chrome/browser/ui/views/reload_button.h"
18 #include "ui/base/accelerators/accelerator.h" 18 #include "ui/base/accelerators/accelerator.h"
19 #include "ui/base/animation/slide_animation.h"
20 #include "ui/views/accessible_pane_view.h" 19 #include "ui/views/accessible_pane_view.h"
21 #include "ui/views/controls/button/menu_button.h" 20 #include "ui/views/controls/button/menu_button.h"
22 #include "ui/views/controls/button/menu_button_listener.h" 21 #include "ui/views/controls/button/menu_button_listener.h"
23 #include "ui/views/view.h" 22 #include "ui/views/view.h"
24 23
25 class BrowserActionsContainer; 24 class BrowserActionsContainer;
26 class Browser; 25 class Browser;
27 class HomeImageButton; 26 class HomeImageButton;
28 class WrenchMenu; 27 class WrenchMenu;
29 class WrenchMenuModel; 28 class WrenchMenuModel;
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 220
222 // A list of listeners to call when the menu opens. 221 // A list of listeners to call when the menu opens.
223 ObserverList<views::MenuListener> menu_listeners_; 222 ObserverList<views::MenuListener> menu_listeners_;
224 223
225 content::NotificationRegistrar registrar_; 224 content::NotificationRegistrar registrar_;
226 225
227 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 226 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
228 }; 227 };
229 228
230 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 229 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698