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

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

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
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)) {
75 *error = ASCIIToUTF16(manifest_errors::kInvalidCommandsKey); 75 *error = base::ASCIIToUTF16(manifest_errors::kInvalidCommandsKey);
76 return false; 76 return false;
77 } 77 }
78 78
79 scoped_ptr<CommandsInfo> commands_info(new CommandsInfo); 79 scoped_ptr<CommandsInfo> commands_info(new CommandsInfo);
80 80
81 int command_index = 0; 81 int command_index = 0;
82 int keybindings_found = 0; 82 int keybindings_found = 0;
83 for (base::DictionaryValue::Iterator iter(*dict); !iter.IsAtEnd(); 83 for (base::DictionaryValue::Iterator iter(*dict); !iter.IsAtEnd();
84 iter.Advance()) { 84 iter.Advance()) {
85 ++command_index; 85 ++command_index;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/content_settings_helper_unittest.cc ('k') | chrome/common/extensions/api/extension_action/action_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698