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

Side by Side Diff: chrome/common/extensions/webview_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 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/webview_handler.h" 5 #include "chrome/common/extensions/webview_handler.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 return partition_is_privileged && extension->ResourceMatches( 59 return partition_is_privileged && extension->ResourceMatches(
60 info->webview_accessible_resources_, relative_path); 60 info->webview_accessible_resources_, relative_path);
61 } 61 }
62 62
63 WebviewHandler::WebviewHandler() { 63 WebviewHandler::WebviewHandler() {
64 } 64 }
65 65
66 WebviewHandler::~WebviewHandler() { 66 WebviewHandler::~WebviewHandler() {
67 } 67 }
68 68
69 bool WebviewHandler::Parse(Extension* extension, string16* error) { 69 bool WebviewHandler::Parse(Extension* extension, base::string16* error) {
70 scoped_ptr<WebviewInfo> info(new WebviewInfo()); 70 scoped_ptr<WebviewInfo> info(new WebviewInfo());
71 71
72 const base::DictionaryValue* dict_value = NULL; 72 const base::DictionaryValue* dict_value = NULL;
73 if (!extension->manifest()->GetDictionary(keys::kWebview, 73 if (!extension->manifest()->GetDictionary(keys::kWebview,
74 &dict_value)) { 74 &dict_value)) {
75 *error = ASCIIToUTF16(errors::kInvalidWebview); 75 *error = ASCIIToUTF16(errors::kInvalidWebview);
76 return false; 76 return false;
77 } 77 }
78 78
79 const base::ListValue* url_list = NULL; 79 const base::ListValue* url_list = NULL;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 } 119 }
120 extension->SetManifestData(keys::kWebviewAccessibleResources, info.release()); 120 extension->SetManifestData(keys::kWebviewAccessibleResources, info.release());
121 return true; 121 return true;
122 } 122 }
123 123
124 const std::vector<std::string> WebviewHandler::Keys() const { 124 const std::vector<std::string> WebviewHandler::Keys() const {
125 return SingleKey(keys::kWebview); 125 return SingleKey(keys::kWebview);
126 } 126 }
127 127
128 } // namespace extensions 128 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/webview_handler.h ('k') | chrome/common/importer/firefox_importer_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698