| 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 "base/memory/scoped_ptr.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 &dict) || | 41 &dict) || |
| 42 !dict->GetString(kKeyword, &info->keyword) || | 42 !dict->GetString(kKeyword, &info->keyword) || |
| 43 info->keyword.empty()) { | 43 info->keyword.empty()) { |
| 44 *error = ASCIIToUTF16(extension_manifest_errors::kInvalidOmniboxKeyword); | 44 *error = ASCIIToUTF16(extension_manifest_errors::kInvalidOmniboxKeyword); |
| 45 return false; | 45 return false; |
| 46 } | 46 } |
| 47 extension->SetManifestData(extension_manifest_keys::kOmnibox, info.release()); | 47 extension->SetManifestData(extension_manifest_keys::kOmnibox, info.release()); |
| 48 return true; | 48 return true; |
| 49 } | 49 } |
| 50 | 50 |
| 51 const std::vector<std::string> OmniboxHandler::Keys() const { |
| 52 return SingleKey(extension_manifest_keys::kOmnibox); |
| 53 } |
| 54 |
| 51 } // namespace extensions | 55 } // namespace extensions |
| OLD | NEW |