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

Side by Side Diff: chrome/common/extensions/api/extension_action/script_badge_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/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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
44 // in the manifest, show a warning if the script badge declaration isn't 44 // in the manifest, show a warning if the script badge declaration isn't
45 // going to have any effect. 45 // going to have any effect.
46 if (!FeatureSwitch::script_badges()->IsEnabled()) { 46 if (!FeatureSwitch::script_badges()->IsEnabled()) {
47 extension->AddInstallWarning( 47 extension->AddInstallWarning(
48 InstallWarning(errors::kScriptBadgeRequiresFlag, keys::kScriptBadge)); 48 InstallWarning(errors::kScriptBadgeRequiresFlag, keys::kScriptBadge));
49 } 49 }
50 50
51 const base::DictionaryValue* dict = NULL; 51 const base::DictionaryValue* dict = NULL;
52 if (!extension->manifest()->GetDictionary(keys::kScriptBadge, &dict)) { 52 if (!extension->manifest()->GetDictionary(keys::kScriptBadge, &dict)) {
53 *error = ASCIIToUTF16(errors::kInvalidScriptBadge); 53 *error = base::ASCIIToUTF16(errors::kInvalidScriptBadge);
54 return false; 54 return false;
55 } 55 }
56 56
57 action_info = ActionInfo::Load(extension, dict, error); 57 action_info = ActionInfo::Load(extension, dict, error);
58 58
59 if (!action_info.get()) 59 if (!action_info.get())
60 return false; // Failed to parse script badge definition. 60 return false; // Failed to parse script badge definition.
61 61
62 // Script badges always use their extension's title and icon so users can rely 62 // Script badges always use their extension's title and icon so users can rely
63 // on the visual appearance to know which extension is running. This isn't 63 // on the visual appearance to know which extension is running. This isn't
(...skipping 37 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