| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 | 334 |
| 335 // If we are displaying a tab-specific icon, it will be here. | 335 // If we are displaying a tab-specific icon, it will be here. |
| 336 GdkPixbuf* tab_specific_icon_; | 336 GdkPixbuf* tab_specific_icon_; |
| 337 | 337 |
| 338 // If the browser action has a default icon, it will be here. | 338 // If the browser action has a default icon, it will be here. |
| 339 GdkPixbuf* default_icon_; | 339 GdkPixbuf* default_icon_; |
| 340 | 340 |
| 341 // Same as |default_icon_|, but stored as SkBitmap. | 341 // Same as |default_icon_|, but stored as SkBitmap. |
| 342 SkBitmap default_skbitmap_; | 342 SkBitmap default_skbitmap_; |
| 343 | 343 |
| 344 GtkSignalRegistrar signals_; | 344 ui::GtkSignalRegistrar signals_; |
| 345 NotificationRegistrar registrar_; | 345 NotificationRegistrar registrar_; |
| 346 | 346 |
| 347 // The context menu view and model for this extension action. | 347 // The context menu view and model for this extension action. |
| 348 scoped_ptr<MenuGtk> context_menu_; | 348 scoped_ptr<MenuGtk> context_menu_; |
| 349 scoped_refptr<ExtensionContextMenuModel> context_menu_model_; | 349 scoped_refptr<ExtensionContextMenuModel> context_menu_model_; |
| 350 | 350 |
| 351 friend class BrowserActionsToolbarGtk; | 351 friend class BrowserActionsToolbarGtk; |
| 352 }; | 352 }; |
| 353 | 353 |
| 354 // BrowserActionsToolbarGtk ---------------------------------------------------- | 354 // BrowserActionsToolbarGtk ---------------------------------------------------- |
| (...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 } | 940 } |
| 941 | 941 |
| 942 it->second.get()->GetContextMenu()->PopupAsContext(event->time); | 942 it->second.get()->GetContextMenu()->PopupAsContext(event->time); |
| 943 return TRUE; | 943 return TRUE; |
| 944 } | 944 } |
| 945 | 945 |
| 946 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) { | 946 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) { |
| 947 if (!resize_animation_.is_animating()) | 947 if (!resize_animation_.is_animating()) |
| 948 UpdateChevronVisibility(); | 948 UpdateChevronVisibility(); |
| 949 } | 949 } |
| OLD | NEW |