Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2104)

Unified Diff: chrome/browser/ui/webui/extensions/command_handler.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/extensions/command_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/command_handler.cc b/chrome/browser/ui/webui/extensions/command_handler.cc
index a3aec9d3a83d73e6d018437d2c8c68fb4338acab..b9f1273b88659e779c5f88f412701908fdf616bf 100644
--- a/chrome/browser/ui/webui/extensions/command_handler.cc
+++ b/chrome/browser/ui/webui/extensions/command_handler.cc
@@ -127,7 +127,8 @@ void CommandHandler::GetAllCommands(base::DictionaryValue* commands) {
CommandService::ALL,
&browser_action,
&active)) {
- extensions_list->Append(browser_action.ToValue((*extension), active));
+ extensions_list->Append(
+ browser_action.ToValue((extension->get()), active));
}
extensions::Command page_action;
@@ -135,7 +136,7 @@ void CommandHandler::GetAllCommands(base::DictionaryValue* commands) {
CommandService::ALL,
&page_action,
&active)) {
- extensions_list->Append(page_action.ToValue((*extension), active));
+ extensions_list->Append(page_action.ToValue((extension->get()), active));
}
extensions::Command script_badge;
@@ -143,7 +144,7 @@ void CommandHandler::GetAllCommands(base::DictionaryValue* commands) {
CommandService::ALL,
&script_badge,
&active)) {
- extensions_list->Append(script_badge.ToValue((*extension), active));
+ extensions_list->Append(script_badge.ToValue((extension->get()), active));
}
extensions::CommandMap named_commands;
@@ -157,7 +158,8 @@ void CommandHandler::GetAllCommands(base::DictionaryValue* commands) {
(*extension)->id(), iter->second.command_name());
active = (shortcut_assigned.key_code() != ui::VKEY_UNKNOWN);
- extensions_list->Append(iter->second.ToValue((*extension), active));
+ extensions_list->Append(
+ iter->second.ToValue((extension->get()), active));
}
}
« no previous file with comments | « chrome/browser/ui/toolbar/action_box_button_controller.cc ('k') | chrome/browser/ui/webui/extensions/extension_icon_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698