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

Side by Side Diff: chrome/common/extensions/api/extension_action/script_badge_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/extension_action/script_badge_handler.h" 5 #include "chrome/common/extensions/api/extension_action/script_badge_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 12 matching lines...) Expand all
23 ScriptBadgeHandler::ScriptBadgeHandler() { 23 ScriptBadgeHandler::ScriptBadgeHandler() {
24 } 24 }
25 25
26 ScriptBadgeHandler::~ScriptBadgeHandler() { 26 ScriptBadgeHandler::~ScriptBadgeHandler() {
27 } 27 }
28 28
29 const std::vector<std::string> ScriptBadgeHandler::PrerequisiteKeys() const { 29 const std::vector<std::string> ScriptBadgeHandler::PrerequisiteKeys() const {
30 return SingleKey(keys::kIcons); 30 return SingleKey(keys::kIcons);
31 } 31 }
32 32
33 bool ScriptBadgeHandler::Parse(Extension* extension, string16* error) { 33 bool ScriptBadgeHandler::Parse(Extension* extension, base::string16* error) {
34 scoped_ptr<ActionInfo> action_info(new ActionInfo); 34 scoped_ptr<ActionInfo> action_info(new ActionInfo);
35 35
36 // Provide a default script badge if one isn't declared in the manifest. 36 // Provide a default script badge if one isn't declared in the manifest.
37 if (!extension->manifest()->HasKey(keys::kScriptBadge)) { 37 if (!extension->manifest()->HasKey(keys::kScriptBadge)) {
38 SetActionInfoDefaults(extension, action_info.get()); 38 SetActionInfoDefaults(extension, action_info.get());
39 ActionInfo::SetScriptBadgeInfo(extension, action_info.release()); 39 ActionInfo::SetScriptBadgeInfo(extension, action_info.release());
40 return true; 40 return true;
41 } 41 }
42 42
43 // So as to not confuse developers if they specify a script badge section 43 // So as to not confuse developers if they specify a script badge section
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 extension_misc::kScriptBadgeIconSizes[i], path); 101 extension_misc::kScriptBadgeIconSizes[i], path);
102 } 102 }
103 } 103 }
104 } 104 }
105 105
106 const std::vector<std::string> ScriptBadgeHandler::Keys() const { 106 const std::vector<std::string> ScriptBadgeHandler::Keys() const {
107 return SingleKey(keys::kScriptBadge); 107 return SingleKey(keys::kScriptBadge);
108 } 108 }
109 109
110 } // namespace extensions 110 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698