OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/gtk/browser_actions_toolbar_gtk.h" | 5 #include "chrome/browser/gtk/browser_actions_toolbar_gtk.h" |
6 | 6 |
7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "app/gfx/canvas_paint.h" | 10 #include "app/gfx/canvas_paint.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 button_(gtk_chrome_button_new()) { | 34 button_(gtk_chrome_button_new()) { |
35 DCHECK(extension_->browser_action()); | 35 DCHECK(extension_->browser_action()); |
36 | 36 |
37 gtk_widget_set_size_request(button_.get(), kButtonSize, kButtonSize); | 37 gtk_widget_set_size_request(button_.get(), kButtonSize, kButtonSize); |
38 | 38 |
39 browser_action_icons_.resize( | 39 browser_action_icons_.resize( |
40 extension->browser_action()->icon_paths().size(), NULL); | 40 extension->browser_action()->icon_paths().size(), NULL); |
41 tracker_ = new ImageLoadingTracker(this, browser_action_icons_.size()); | 41 tracker_ = new ImageLoadingTracker(this, browser_action_icons_.size()); |
42 for (size_t i = 0; i < extension->browser_action()->icon_paths().size(); | 42 for (size_t i = 0; i < extension->browser_action()->icon_paths().size(); |
43 ++i) { | 43 ++i) { |
44 tracker_->PostLoadImageTask(extension->GetResource( | 44 tracker_->PostLoadImageTask( |
45 extension->browser_action()->icon_paths()[i])); | 45 extension->GetResource(*iter), |
| 46 gfx::Size(Extension::kBrowserActionIconMaxSize, |
| 47 Extension::kBrowserActionIconMaxSize)); |
46 } | 48 } |
47 | 49 |
48 OnStateUpdated(); | 50 OnStateUpdated(); |
49 | 51 |
50 // We need to hook up extension popups here. http://crbug.com/23897 | 52 // We need to hook up extension popups here. http://crbug.com/23897 |
51 g_signal_connect(button_.get(), "clicked", | 53 g_signal_connect(button_.get(), "clicked", |
52 G_CALLBACK(OnButtonClicked), this); | 54 G_CALLBACK(OnButtonClicked), this); |
53 g_signal_connect_after(button_.get(), "expose-event", | 55 g_signal_connect_after(button_.get(), "expose-event", |
54 G_CALLBACK(OnExposeEvent), this); | 56 G_CALLBACK(OnExposeEvent), this); |
55 | 57 |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 if (extension_button_map_.erase(extension->id())) | 225 if (extension_button_map_.erase(extension->id())) |
224 UpdateVisibility(); | 226 UpdateVisibility(); |
225 } | 227 } |
226 | 228 |
227 void BrowserActionsToolbarGtk::UpdateVisibility() { | 229 void BrowserActionsToolbarGtk::UpdateVisibility() { |
228 if (button_count() == 0) | 230 if (button_count() == 0) |
229 gtk_widget_hide(widget()); | 231 gtk_widget_hide(widget()); |
230 else | 232 else |
231 gtk_widget_show(widget()); | 233 gtk_widget_show(widget()); |
232 } | 234 } |
OLD | NEW |