| 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 16 matching lines...) Expand all  Loading... | 
| 27 #include "chrome/common/extensions/extension.h" | 27 #include "chrome/common/extensions/extension.h" | 
| 28 #include "chrome/common/extensions/extension_action.h" | 28 #include "chrome/common/extensions/extension_action.h" | 
| 29 #include "chrome/common/extensions/extension_resource.h" | 29 #include "chrome/common/extensions/extension_resource.h" | 
| 30 #include "content/browser/tab_contents/tab_contents.h" | 30 #include "content/browser/tab_contents/tab_contents.h" | 
| 31 #include "content/common/notification_details.h" | 31 #include "content/common/notification_details.h" | 
| 32 #include "content/common/notification_service.h" | 32 #include "content/common/notification_service.h" | 
| 33 #include "content/common/notification_source.h" | 33 #include "content/common/notification_source.h" | 
| 34 #include "content/common/notification_type.h" | 34 #include "content/common/notification_type.h" | 
| 35 #include "grit/app_resources.h" | 35 #include "grit/app_resources.h" | 
| 36 #include "grit/theme_resources.h" | 36 #include "grit/theme_resources.h" | 
|  | 37 #include "grit/theme_resources_standard.h" | 
| 37 #include "ui/gfx/canvas_skia_paint.h" | 38 #include "ui/gfx/canvas_skia_paint.h" | 
| 38 #include "ui/gfx/gtk_util.h" | 39 #include "ui/gfx/gtk_util.h" | 
| 39 | 40 | 
| 40 namespace { | 41 namespace { | 
| 41 | 42 | 
| 42 // The width of the browser action buttons. | 43 // The width of the browser action buttons. | 
| 43 const int kButtonWidth = 27; | 44 const int kButtonWidth = 27; | 
| 44 | 45 | 
| 45 // The padding between browser action buttons. | 46 // The padding between browser action buttons. | 
| 46 const int kButtonPadding = 4; | 47 const int kButtonPadding = 4; | 
| (...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 953 | 954 | 
| 954   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root), | 955   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root), | 
| 955                        event->time); | 956                        event->time); | 
| 956   return TRUE; | 957   return TRUE; | 
| 957 } | 958 } | 
| 958 | 959 | 
| 959 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) { | 960 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) { | 
| 960   if (!resize_animation_.is_animating()) | 961   if (!resize_animation_.is_animating()) | 
| 961     UpdateChevronVisibility(); | 962     UpdateChevronVisibility(); | 
| 962 } | 963 } | 
| OLD | NEW | 
|---|