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

Side by Side Diff: chrome/common/extensions/api/omnibox/omnibox_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 (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/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 16 matching lines...) Expand all
27 extension->GetManifestData(manifest_keys::kOmnibox)); 27 extension->GetManifestData(manifest_keys::kOmnibox));
28 return info ? info->keyword : base::EmptyString(); 28 return info ? info->keyword : base::EmptyString();
29 } 29 }
30 30
31 OmniboxHandler::OmniboxHandler() { 31 OmniboxHandler::OmniboxHandler() {
32 } 32 }
33 33
34 OmniboxHandler::~OmniboxHandler() { 34 OmniboxHandler::~OmniboxHandler() {
35 } 35 }
36 36
37 bool OmniboxHandler::Parse(Extension* extension, string16* error) { 37 bool OmniboxHandler::Parse(Extension* extension, base::string16* error) {
38 scoped_ptr<OmniboxInfo> info(new OmniboxInfo); 38 scoped_ptr<OmniboxInfo> info(new OmniboxInfo);
39 const base::DictionaryValue* dict = NULL; 39 const base::DictionaryValue* dict = NULL;
40 if (!extension->manifest()->GetDictionary(manifest_keys::kOmnibox, 40 if (!extension->manifest()->GetDictionary(manifest_keys::kOmnibox,
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(manifest_errors::kInvalidOmniboxKeyword); 44 *error = ASCIIToUTF16(manifest_errors::kInvalidOmniboxKeyword);
45 return false; 45 return false;
46 } 46 }
47 extension->SetManifestData(manifest_keys::kOmnibox, info.release()); 47 extension->SetManifestData(manifest_keys::kOmnibox, info.release());
48 return true; 48 return true;
49 } 49 }
50 50
51 const std::vector<std::string> OmniboxHandler::Keys() const { 51 const std::vector<std::string> OmniboxHandler::Keys() const {
52 return SingleKey(manifest_keys::kOmnibox); 52 return SingleKey(manifest_keys::kOmnibox);
53 } 53 }
54 54
55 } // namespace extensions 55 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/omnibox/omnibox_handler.h ('k') | chrome/common/extensions/api/plugins/plugins_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698