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

Side by Side Diff: chrome/common/extensions/api/commands/commands_handler.cc

Issue 105473003: Add explicit base namespace to string16 users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/common/extensions/api/commands/commands_handler.h" 5 #include "chrome/common/extensions/api/commands/commands_handler.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "extensions/common/error_utils.h" 10 #include "extensions/common/error_utils.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 extension->GetManifestData(keys::kCommands)); 54 extension->GetManifestData(keys::kCommands));
55 return info ? &info->named_commands : NULL; 55 return info ? &info->named_commands : NULL;
56 } 56 }
57 57
58 CommandsHandler::CommandsHandler() { 58 CommandsHandler::CommandsHandler() {
59 } 59 }
60 60
61 CommandsHandler::~CommandsHandler() { 61 CommandsHandler::~CommandsHandler() {
62 } 62 }
63 63
64 bool CommandsHandler::Parse(Extension* extension, string16* error) { 64 bool CommandsHandler::Parse(Extension* extension, base::string16* error) {
65 if (!extension->manifest()->HasKey(keys::kCommands)) { 65 if (!extension->manifest()->HasKey(keys::kCommands)) {
66 scoped_ptr<CommandsInfo> commands_info(new CommandsInfo); 66 scoped_ptr<CommandsInfo> commands_info(new CommandsInfo);
67 MaybeSetBrowserActionDefault(extension, commands_info.get()); 67 MaybeSetBrowserActionDefault(extension, commands_info.get());
68 extension->SetManifestData(keys::kCommands, 68 extension->SetManifestData(keys::kCommands,
69 commands_info.release()); 69 commands_info.release());
70 return true; 70 return true;
71 } 71 }
72 72
73 const base::DictionaryValue* dict = NULL; 73 const base::DictionaryValue* dict = NULL;
74 if (!extension->manifest()->GetDictionary(keys::kCommands, &dict)) { 74 if (!extension->manifest()->GetDictionary(keys::kCommands, &dict)) {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 type == Manifest::TYPE_LEGACY_PACKAGED_APP || 132 type == Manifest::TYPE_LEGACY_PACKAGED_APP ||
133 type == Manifest::TYPE_PLATFORM_APP; 133 type == Manifest::TYPE_PLATFORM_APP;
134 } 134 }
135 135
136 void CommandsHandler::MaybeSetBrowserActionDefault(const Extension* extension, 136 void CommandsHandler::MaybeSetBrowserActionDefault(const Extension* extension,
137 CommandsInfo* info) { 137 CommandsInfo* info) {
138 if (extension->manifest()->HasKey(keys::kBrowserAction) && 138 if (extension->manifest()->HasKey(keys::kBrowserAction) &&
139 !info->browser_action_command.get()) { 139 !info->browser_action_command.get()) {
140 info->browser_action_command.reset( 140 info->browser_action_command.reset(
141 new Command(manifest_values::kBrowserActionCommandEvent, 141 new Command(manifest_values::kBrowserActionCommandEvent,
142 string16(), 142 base::string16(),
143 std::string(), 143 std::string(),
144 false)); 144 false));
145 } 145 }
146 } 146 }
147 147
148 const std::vector<std::string> CommandsHandler::Keys() const { 148 const std::vector<std::string> CommandsHandler::Keys() const {
149 return SingleKey(keys::kCommands); 149 return SingleKey(keys::kCommands);
150 } 150 }
151 151
152 } // namespace extensions 152 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/commands/commands_handler.h ('k') | chrome/common/extensions/api/extension_action/action_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698