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

Side by Side Diff: chrome/common/extensions/api/extension_action/browser_action_handler.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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/common/extensions/api/extension_action/browser_action_handler.h " 5 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h "
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/common/extensions/extension_constants.h" 10 #include "chrome/common/extensions/extension_constants.h"
(...skipping 10 matching lines...) Expand all
21 } 21 }
22 22
23 BrowserActionHandler::~BrowserActionHandler() { 23 BrowserActionHandler::~BrowserActionHandler() {
24 } 24 }
25 25
26 bool BrowserActionHandler::Parse(Extension* extension, 26 bool BrowserActionHandler::Parse(Extension* extension,
27 base::string16* error) { 27 base::string16* error) {
28 const base::DictionaryValue* dict = NULL; 28 const base::DictionaryValue* dict = NULL;
29 if (!extension->manifest()->GetDictionary( 29 if (!extension->manifest()->GetDictionary(
30 manifest_keys::kBrowserAction, &dict)) { 30 manifest_keys::kBrowserAction, &dict)) {
31 *error = ASCIIToUTF16(manifest_errors::kInvalidBrowserAction); 31 *error = base::ASCIIToUTF16(manifest_errors::kInvalidBrowserAction);
32 return false; 32 return false;
33 } 33 }
34 34
35 scoped_ptr<ActionInfo> action_info = ActionInfo::Load(extension, dict, error); 35 scoped_ptr<ActionInfo> action_info = ActionInfo::Load(extension, dict, error);
36 if (!action_info.get()) 36 if (!action_info.get())
37 return false; // Failed to parse browser action definition. 37 return false; // Failed to parse browser action definition.
38 38
39 ActionInfo::SetBrowserActionInfo(extension, action_info.release()); 39 ActionInfo::SetBrowserActionInfo(extension, action_info.release());
40 40
41 return true; 41 return true;
(...skipping 13 matching lines...) Expand all
55 return false; 55 return false;
56 } 56 }
57 return true; 57 return true;
58 } 58 }
59 59
60 const std::vector<std::string> BrowserActionHandler::Keys() const { 60 const std::vector<std::string> BrowserActionHandler::Keys() const {
61 return SingleKey(manifest_keys::kBrowserAction); 61 return SingleKey(manifest_keys::kBrowserAction);
62 } 62 }
63 63
64 } // namespace extensions 64 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698