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

Side by Side Diff: chrome/browser/extensions/convert_user_script.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/extensions/convert_user_script.h" 5 #include "chrome/browser/extensions/convert_user_script.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // TODO(rdevlin.cronin): Continue removing std::string errors and replacing 173 // TODO(rdevlin.cronin): Continue removing std::string errors and replacing
174 // with string16 174 // with string16
175 std::string utf8_error; 175 std::string utf8_error;
176 scoped_refptr<Extension> extension = Extension::Create( 176 scoped_refptr<Extension> extension = Extension::Create(
177 temp_dir.path(), 177 temp_dir.path(),
178 Manifest::INTERNAL, 178 Manifest::INTERNAL,
179 *root, 179 *root,
180 Extension::NO_FLAGS, 180 Extension::NO_FLAGS,
181 &utf8_error); 181 &utf8_error);
182 *error = UTF8ToUTF16(utf8_error); 182 *error = UTF8ToUTF16(utf8_error);
183 if (!extension) { 183 if (!extension.get()) {
184 NOTREACHED() << "Could not init extension " << *error; 184 NOTREACHED() << "Could not init extension " << *error;
185 return NULL; 185 return NULL;
186 } 186 }
187 187
188 temp_dir.Take(); // The caller takes ownership of the directory. 188 temp_dir.Take(); // The caller takes ownership of the directory.
189 return extension; 189 return extension;
190 } 190 }
191 191
192 } // namespace extensions 192 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/extensions/convert_user_script_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698