| Index: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| index 103bd97a018b2109ea673963426530e4b518b71d..2e97e0e7190373fe22cec5b5d48a4b50136689d4 100644
|
| --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| @@ -626,7 +626,7 @@ void BrowserActionsToolbarGtk::CreateAllButtons() {
|
| const extensions::ExtensionList& toolbar_items = model_->toolbar_items();
|
| for (extensions::ExtensionList::const_iterator iter = toolbar_items.begin();
|
| iter != toolbar_items.end(); ++iter) {
|
| - CreateButtonForExtension(*iter, i++);
|
| + CreateButtonForExtension(iter->get(), i++);
|
| }
|
| }
|
|
|
| @@ -796,9 +796,9 @@ bool BrowserActionsToolbarGtk::IsCommandIdChecked(int command_id) const {
|
| }
|
|
|
| bool BrowserActionsToolbarGtk::IsCommandIdEnabled(int command_id) const {
|
| - const Extension* extension = model_->toolbar_items()[command_id];
|
| - return ExtensionActionManager::Get(profile_)->
|
| - GetBrowserAction(*extension)->GetIsVisible(GetCurrentTabId());
|
| + const Extension* extension = model_->toolbar_items()[command_id].get();
|
| + return ExtensionActionManager::Get(profile_)->GetBrowserAction(*extension)
|
| + ->GetIsVisible(GetCurrentTabId());
|
| }
|
|
|
| bool BrowserActionsToolbarGtk::GetAcceleratorForCommandId(
|
| @@ -808,7 +808,7 @@ bool BrowserActionsToolbarGtk::GetAcceleratorForCommandId(
|
| }
|
|
|
| void BrowserActionsToolbarGtk::ExecuteCommand(int command_id, int event_flags) {
|
| - const Extension* extension = model_->toolbar_items()[command_id];
|
| + const Extension* extension = model_->toolbar_items()[command_id].get();
|
| GURL popup_url;
|
|
|
| switch (model_->ExecuteBrowserAction(extension, browser(), &popup_url)) {
|
| @@ -1040,7 +1040,7 @@ gboolean BrowserActionsToolbarGtk::OnOverflowButtonPress(
|
| if (profile_->IsOffTheRecord())
|
| model_index = model_->IncognitoIndexToOriginal(i);
|
|
|
| - const Extension* extension = model_->toolbar_items()[model_index];
|
| + const Extension* extension = model_->toolbar_items()[model_index].get();
|
| BrowserActionButton* button = extension_button_map_[extension->id()].get();
|
|
|
| overflow_menu_model_->AddItem(model_index, UTF8ToUTF16(extension->name()));
|
| @@ -1080,9 +1080,8 @@ gboolean BrowserActionsToolbarGtk::OnOverflowMenuButtonPress(
|
| if (profile_->IsOffTheRecord())
|
| item_index = model_->IncognitoIndexToOriginal(item_index);
|
|
|
| - const Extension* extension = model_->toolbar_items()[item_index];
|
| - ExtensionButtonMap::iterator it = extension_button_map_.find(
|
| - extension->id());
|
| + const Extension* extension = model_->toolbar_items()[item_index].get();
|
| + ExtensionButtonMap::iterator it = extension_button_map_.find(extension->id());
|
| if (it == extension_button_map_.end()) {
|
| NOTREACHED();
|
| return FALSE;
|
|
|