| OLD | NEW |
| 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/common/extensions/api/omnibox/omnibox_handler.h" | 5 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include <memory> |
| 8 |
| 8 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/values.h" | 11 #include "base/values.h" |
| 11 #include "extensions/common/extension.h" | 12 #include "extensions/common/extension.h" |
| 12 #include "extensions/common/manifest.h" | 13 #include "extensions/common/manifest.h" |
| 13 #include "extensions/common/manifest_constants.h" | 14 #include "extensions/common/manifest_constants.h" |
| 14 | 15 |
| 15 namespace extensions { | 16 namespace extensions { |
| 16 | 17 |
| 17 namespace { | 18 namespace { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 28 return info ? info->keyword : base::EmptyString(); | 29 return info ? info->keyword : base::EmptyString(); |
| 29 } | 30 } |
| 30 | 31 |
| 31 OmniboxHandler::OmniboxHandler() { | 32 OmniboxHandler::OmniboxHandler() { |
| 32 } | 33 } |
| 33 | 34 |
| 34 OmniboxHandler::~OmniboxHandler() { | 35 OmniboxHandler::~OmniboxHandler() { |
| 35 } | 36 } |
| 36 | 37 |
| 37 bool OmniboxHandler::Parse(Extension* extension, base::string16* error) { | 38 bool OmniboxHandler::Parse(Extension* extension, base::string16* error) { |
| 38 scoped_ptr<OmniboxInfo> info(new OmniboxInfo); | 39 std::unique_ptr<OmniboxInfo> info(new OmniboxInfo); |
| 39 const base::DictionaryValue* dict = NULL; | 40 const base::DictionaryValue* dict = NULL; |
| 40 if (!extension->manifest()->GetDictionary(manifest_keys::kOmnibox, | 41 if (!extension->manifest()->GetDictionary(manifest_keys::kOmnibox, |
| 41 &dict) || | 42 &dict) || |
| 42 !dict->GetString(kKeyword, &info->keyword) || | 43 !dict->GetString(kKeyword, &info->keyword) || |
| 43 info->keyword.empty()) { | 44 info->keyword.empty()) { |
| 44 *error = base::ASCIIToUTF16(manifest_errors::kInvalidOmniboxKeyword); | 45 *error = base::ASCIIToUTF16(manifest_errors::kInvalidOmniboxKeyword); |
| 45 return false; | 46 return false; |
| 46 } | 47 } |
| 47 extension->SetManifestData(manifest_keys::kOmnibox, info.release()); | 48 extension->SetManifestData(manifest_keys::kOmnibox, info.release()); |
| 48 return true; | 49 return true; |
| 49 } | 50 } |
| 50 | 51 |
| 51 const std::vector<std::string> OmniboxHandler::Keys() const { | 52 const std::vector<std::string> OmniboxHandler::Keys() const { |
| 52 return SingleKey(manifest_keys::kOmnibox); | 53 return SingleKey(manifest_keys::kOmnibox); |
| 53 } | 54 } |
| 54 | 55 |
| 55 } // namespace extensions | 56 } // namespace extensions |
| OLD | NEW |