| OLD | NEW |
| 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/action_box_button_gtk.h" | 5 #include "chrome/browser/ui/gtk/action_box_button_gtk.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "chrome/browser/extensions/extension_icon_image.h" | 10 #include "chrome/browser/extensions/extension_icon_image.h" |
| 11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/gtk/custom_button.h" | 12 #include "chrome/browser/ui/gtk/custom_button.h" |
| 13 #include "chrome/browser/ui/gtk/view_id_util.h" | 13 #include "chrome/browser/ui/gtk/view_id_util.h" |
| 14 #include "chrome/browser/ui/toolbar/action_box_menu_model.h" | 14 #include "chrome/browser/ui/toolbar/action_box_menu_model.h" |
| 15 #include "chrome/browser/ui/view_ids.h" | 15 #include "chrome/browser/ui/view_ids.h" |
| 16 #include "chrome/common/extensions/api/extension_action/action_info.h" | 16 #include "chrome/common/extensions/api/extension_action/action_info.h" |
| 17 #include "chrome/common/extensions/api/icons/icons_handler.h" | |
| 18 #include "chrome/common/extensions/extension.h" | 17 #include "chrome/common/extensions/extension.h" |
| 19 #include "chrome/common/extensions/extension_constants.h" | 18 #include "chrome/common/extensions/extension_constants.h" |
| 19 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" |
| 20 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
| 21 #include "grit/theme_resources.h" | 21 #include "grit/theme_resources.h" |
| 22 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
| 23 #include "ui/base/layout.h" | 23 #include "ui/base/layout.h" |
| 24 #include "ui/gfx/gtk_util.h" | 24 #include "ui/gfx/gtk_util.h" |
| 25 #include "ui/gfx/image/image_skia.h" | 25 #include "ui/gfx/image/image_skia.h" |
| 26 #include "ui/gfx/image/image_skia_rep.h" | 26 #include "ui/gfx/image/image_skia_rep.h" |
| 27 | 27 |
| 28 using extensions::ActionInfo; | 28 using extensions::ActionInfo; |
| 29 using extensions::Extension; | 29 using extensions::Extension; |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 1, | 155 1, |
| 156 gtk_get_current_event_time()); | 156 gtk_get_current_event_time()); |
| 157 } | 157 } |
| 158 | 158 |
| 159 gboolean ActionBoxButtonGtk::OnButtonPress(GtkWidget* widget, | 159 gboolean ActionBoxButtonGtk::OnButtonPress(GtkWidget* widget, |
| 160 GdkEventButton* event) { | 160 GdkEventButton* event) { |
| 161 if (event->button == 1) | 161 if (event->button == 1) |
| 162 controller_.OnButtonClicked(); | 162 controller_.OnButtonClicked(); |
| 163 return FALSE; | 163 return FALSE; |
| 164 } | 164 } |
| OLD | NEW |