| OLD | NEW |
| 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 "extensions/common/extension_builder.h" | 5 #include "extensions/common/extension_builder.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "extensions/common/extension.h" | 9 #include "extensions/common/extension.h" |
| 10 | 10 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 path_ = path; | 49 path_ = path; |
| 50 return *this; | 50 return *this; |
| 51 } | 51 } |
| 52 | 52 |
| 53 ExtensionBuilder& ExtensionBuilder::SetLocation(Manifest::Location location) { | 53 ExtensionBuilder& ExtensionBuilder::SetLocation(Manifest::Location location) { |
| 54 location_ = location; | 54 location_ = location; |
| 55 return *this; | 55 return *this; |
| 56 } | 56 } |
| 57 | 57 |
| 58 ExtensionBuilder& ExtensionBuilder::SetManifest( | 58 ExtensionBuilder& ExtensionBuilder::SetManifest( |
| 59 scoped_ptr<base::DictionaryValue> manifest) { | 59 std::unique_ptr<base::DictionaryValue> manifest) { |
| 60 manifest_ = std::move(manifest); | 60 manifest_ = std::move(manifest); |
| 61 return *this; | 61 return *this; |
| 62 } | 62 } |
| 63 | 63 |
| 64 ExtensionBuilder& ExtensionBuilder::MergeManifest( | 64 ExtensionBuilder& ExtensionBuilder::MergeManifest( |
| 65 scoped_ptr<base::DictionaryValue> manifest) { | 65 std::unique_ptr<base::DictionaryValue> manifest) { |
| 66 manifest_->MergeDictionary(manifest.get()); | 66 manifest_->MergeDictionary(manifest.get()); |
| 67 return *this; | 67 return *this; |
| 68 } | 68 } |
| 69 | 69 |
| 70 ExtensionBuilder& ExtensionBuilder::AddFlags(int init_from_value_flags) { | 70 ExtensionBuilder& ExtensionBuilder::AddFlags(int init_from_value_flags) { |
| 71 flags_ |= init_from_value_flags; | 71 flags_ |= init_from_value_flags; |
| 72 return *this; | 72 return *this; |
| 73 } | 73 } |
| 74 | 74 |
| 75 ExtensionBuilder& ExtensionBuilder::SetID(const std::string& id) { | 75 ExtensionBuilder& ExtensionBuilder::SetID(const std::string& id) { |
| 76 id_ = id; | 76 id_ = id; |
| 77 return *this; | 77 return *this; |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace extensions | 80 } // namespace extensions |
| OLD | NEW |