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

Side by Side Diff: chrome/common/extensions/api/url_handlers/url_handlers_parser.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/url_handlers/url_handlers_parser.h" 5 #include "chrome/common/extensions/api/url_handlers/url_handlers_parser.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 UrlHandlersParser::UrlHandlersParser() { 85 UrlHandlersParser::UrlHandlersParser() {
86 } 86 }
87 87
88 UrlHandlersParser::~UrlHandlersParser() { 88 UrlHandlersParser::~UrlHandlersParser() {
89 } 89 }
90 90
91 bool ParseUrlHandler(const std::string& handler_id, 91 bool ParseUrlHandler(const std::string& handler_id,
92 const DictionaryValue& handler_info, 92 const DictionaryValue& handler_info,
93 std::vector<UrlHandlerInfo>* url_handlers, 93 std::vector<UrlHandlerInfo>* url_handlers,
94 string16* error) { 94 base::string16* error) {
95 DCHECK(error); 95 DCHECK(error);
96 96
97 UrlHandlerInfo handler; 97 UrlHandlerInfo handler;
98 handler.id = handler_id; 98 handler.id = handler_id;
99 99
100 if (!handler_info.GetString(mkeys::kUrlHandlerTitle, &handler.title)) { 100 if (!handler_info.GetString(mkeys::kUrlHandlerTitle, &handler.title)) {
101 *error = ASCIIToUTF16(merrors::kInvalidURLHandlerTitle); 101 *error = ASCIIToUTF16(merrors::kInvalidURLHandlerTitle);
102 return false; 102 return false;
103 } 103 }
104 104
(...skipping 20 matching lines...) Expand all
125 return false; 125 return false;
126 } 126 }
127 handler.patterns.AddPattern(pattern); 127 handler.patterns.AddPattern(pattern);
128 } 128 }
129 129
130 url_handlers->push_back(handler); 130 url_handlers->push_back(handler);
131 131
132 return true; 132 return true;
133 } 133 }
134 134
135 bool UrlHandlersParser::Parse(Extension* extension, string16* error) { 135 bool UrlHandlersParser::Parse(Extension* extension, base::string16* error) {
136 scoped_ptr<UrlHandlers> info(new UrlHandlers); 136 scoped_ptr<UrlHandlers> info(new UrlHandlers);
137 const DictionaryValue* all_handlers = NULL; 137 const DictionaryValue* all_handlers = NULL;
138 if (!extension->manifest()->GetDictionary( 138 if (!extension->manifest()->GetDictionary(
139 mkeys::kUrlHandlers, &all_handlers)) { 139 mkeys::kUrlHandlers, &all_handlers)) {
140 *error = ASCIIToUTF16(merrors::kInvalidURLHandlers); 140 *error = ASCIIToUTF16(merrors::kInvalidURLHandlers);
141 return false; 141 return false;
142 } 142 }
143 143
144 DCHECK(extension->is_platform_app()); 144 DCHECK(extension->is_platform_app());
145 145
(...skipping 15 matching lines...) Expand all
161 extension->SetManifestData(mkeys::kUrlHandlers, info.release()); 161 extension->SetManifestData(mkeys::kUrlHandlers, info.release());
162 162
163 return true; 163 return true;
164 } 164 }
165 165
166 const std::vector<std::string> UrlHandlersParser::Keys() const { 166 const std::vector<std::string> UrlHandlersParser::Keys() const {
167 return SingleKey(mkeys::kUrlHandlers); 167 return SingleKey(mkeys::kUrlHandlers);
168 } 168 }
169 169
170 } // namespace extensions 170 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/url_handlers/url_handlers_parser.h ('k') | chrome/common/extensions/command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698