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

Side by Side Diff: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

Issue 9447096: gtk: Rename GtkThemeService to ThemeServiceGtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | 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 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h" 5 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/i18n/rtl.h" 11 #include "base/i18n/rtl.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/extensions/extension_browser_event_router.h" 14 #include "chrome/browser/extensions/extension_browser_event_router.h"
15 #include "chrome/browser/extensions/extension_context_menu_model.h" 15 #include "chrome/browser/extensions/extension_context_menu_model.h"
16 #include "chrome/browser/extensions/extension_service.h" 16 #include "chrome/browser/extensions/extension_service.h"
17 #include "chrome/browser/extensions/image_loading_tracker.h" 17 #include "chrome/browser/extensions/image_loading_tracker.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/sessions/restore_tab_helper.h" 19 #include "chrome/browser/sessions/restore_tab_helper.h"
20 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h" 21 #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h"
22 #include "chrome/browser/ui/gtk/gtk_chrome_button.h" 22 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
23 #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h" 23 #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
24 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
25 #include "chrome/browser/ui/gtk/gtk_util.h" 24 #include "chrome/browser/ui/gtk/gtk_util.h"
26 #include "chrome/browser/ui/gtk/hover_controller_gtk.h" 25 #include "chrome/browser/ui/gtk/hover_controller_gtk.h"
27 #include "chrome/browser/ui/gtk/menu_gtk.h" 26 #include "chrome/browser/ui/gtk/menu_gtk.h"
27 #include "chrome/browser/ui/gtk/theme_service_gtk.h"
28 #include "chrome/browser/ui/gtk/view_id_util.h" 28 #include "chrome/browser/ui/gtk/view_id_util.h"
29 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 29 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
30 #include "chrome/common/chrome_notification_types.h" 30 #include "chrome/common/chrome_notification_types.h"
31 #include "chrome/common/extensions/extension.h" 31 #include "chrome/common/extensions/extension.h"
32 #include "chrome/common/extensions/extension_action.h" 32 #include "chrome/common/extensions/extension_action.h"
33 #include "chrome/common/extensions/extension_resource.h" 33 #include "chrome/common/extensions/extension_resource.h"
34 #include "content/public/browser/notification_details.h" 34 #include "content/public/browser/notification_details.h"
35 #include "content/public/browser/notification_source.h" 35 #include "content/public/browser/notification_source.h"
36 #include "grit/theme_resources.h" 36 #include "grit/theme_resources.h"
37 #include "grit/theme_resources_standard.h" 37 #include "grit/theme_resources_standard.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 using ui::SimpleMenuModel; 81 using ui::SimpleMenuModel;
82 82
83 class BrowserActionButton : public content::NotificationObserver, 83 class BrowserActionButton : public content::NotificationObserver,
84 public ImageLoadingTracker::Observer, 84 public ImageLoadingTracker::Observer,
85 public ExtensionContextMenuModel::PopupDelegate, 85 public ExtensionContextMenuModel::PopupDelegate,
86 public MenuGtk::Delegate { 86 public MenuGtk::Delegate {
87 public: 87 public:
88 BrowserActionButton(BrowserActionsToolbarGtk* toolbar, 88 BrowserActionButton(BrowserActionsToolbarGtk* toolbar,
89 const Extension* extension, 89 const Extension* extension,
90 GtkThemeService* theme_provider) 90 ThemeServiceGtk* theme_provider)
91 : toolbar_(toolbar), 91 : toolbar_(toolbar),
92 extension_(extension), 92 extension_(extension),
93 image_(NULL), 93 image_(NULL),
94 tracker_(this), 94 tracker_(this),
95 tab_specific_icon_(NULL), 95 tab_specific_icon_(NULL),
96 default_icon_(NULL) { 96 default_icon_(NULL) {
97 button_.reset(new CustomDrawButton( 97 button_.reset(new CustomDrawButton(
98 theme_provider, 98 theme_provider,
99 IDR_BROWSER_ACTION, 99 IDR_BROWSER_ACTION,
100 IDR_BROWSER_ACTION_P, 100 IDR_BROWSER_ACTION_P,
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 scoped_refptr<ExtensionContextMenuModel> context_menu_model_; 361 scoped_refptr<ExtensionContextMenuModel> context_menu_model_;
362 362
363 friend class BrowserActionsToolbarGtk; 363 friend class BrowserActionsToolbarGtk;
364 }; 364 };
365 365
366 // BrowserActionsToolbarGtk ---------------------------------------------------- 366 // BrowserActionsToolbarGtk ----------------------------------------------------
367 367
368 BrowserActionsToolbarGtk::BrowserActionsToolbarGtk(Browser* browser) 368 BrowserActionsToolbarGtk::BrowserActionsToolbarGtk(Browser* browser)
369 : browser_(browser), 369 : browser_(browser),
370 profile_(browser->profile()), 370 profile_(browser->profile()),
371 theme_service_(GtkThemeService::GetFrom(browser->profile())), 371 theme_service_(ThemeServiceGtk::GetFrom(browser->profile())),
372 model_(NULL), 372 model_(NULL),
373 hbox_(gtk_hbox_new(FALSE, 0)), 373 hbox_(gtk_hbox_new(FALSE, 0)),
374 button_hbox_(gtk_chrome_shrinkable_hbox_new(TRUE, FALSE, kButtonPadding)), 374 button_hbox_(gtk_chrome_shrinkable_hbox_new(TRUE, FALSE, kButtonPadding)),
375 drag_button_(NULL), 375 drag_button_(NULL),
376 drop_index_(-1), 376 drop_index_(-1),
377 resize_animation_(this), 377 resize_animation_(this),
378 desired_width_(0), 378 desired_width_(0),
379 start_width_(0), 379 start_width_(0),
380 weak_factory_(this) { 380 weak_factory_(this) {
381 ExtensionService* extension_service = profile_->GetExtensionService(); 381 ExtensionService* extension_service = profile_->GetExtensionService();
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 973
974 menu->PopupAsContext(gfx::Point(event->x_root, event->y_root), 974 menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
975 event->time); 975 event->time);
976 return TRUE; 976 return TRUE;
977 } 977 }
978 978
979 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) { 979 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
980 if (!resize_animation_.is_animating()) 980 if (!resize_animation_.is_animating())
981 UpdateChevronVisibility(); 981 UpdateChevronVisibility();
982 } 982 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h ('k') | chrome/browser/ui/gtk/browser_titlebar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698