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

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

Issue 508783002: Update old syntax for action default_icon to populate 19 and 38px icons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Docs update Created 6 years, 3 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
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/action_info.h" 5 #include "chrome/common/extensions/api/extension_action/action_info.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 "chrome/common/extensions/api/commands/commands_handler.h" 9 #include "chrome/common/extensions/api/commands/commands_handler.h"
10 #include "extensions/common/constants.h" 10 #include "extensions/common/constants.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 extension_misc::kExtensionActionIconSizes, 96 extension_misc::kExtensionActionIconSizes,
97 extension_misc::kNumExtensionActionIconSizes, 97 extension_misc::kNumExtensionActionIconSizes,
98 &result->default_icon, 98 &result->default_icon,
99 error)) { 99 error)) {
100 return scoped_ptr<ActionInfo>(); 100 return scoped_ptr<ActionInfo>();
101 } 101 }
102 } else if (dict->GetString(keys::kPageActionDefaultIcon, &default_icon) && 102 } else if (dict->GetString(keys::kPageActionDefaultIcon, &default_icon) &&
103 manifest_handler_helpers::NormalizeAndValidatePath( 103 manifest_handler_helpers::NormalizeAndValidatePath(
104 &default_icon)) { 104 &default_icon)) {
105 result->default_icon.Add(extension_misc::EXTENSION_ICON_ACTION, 105 result->default_icon.Add(extension_misc::EXTENSION_ICON_ACTION,
106 default_icon); 106 default_icon);
not at google - send to devlin 2014/08/26 22:25:41 The default icon logic will automatically scale do
gpdavis 2014/08/26 23:24:43 Done.
107 result->default_icon.Add(extension_misc::EXTENSION_ICON_ACTION * 2,
108 default_icon);
107 } else { 109 } else {
108 *error = base::ASCIIToUTF16(errors::kInvalidPageActionIconPath); 110 *error = base::ASCIIToUTF16(errors::kInvalidPageActionIconPath);
109 return scoped_ptr<ActionInfo>(); 111 return scoped_ptr<ActionInfo>();
110 } 112 }
111 } 113 }
112 114
113 // Read the page action title from |default_title| if present, |name| if not 115 // Read the page action title from |default_title| if present, |name| if not
114 // (both optional). 116 // (both optional).
115 if (dict->HasKey(keys::kPageActionDefaultTitle)) { 117 if (dict->HasKey(keys::kPageActionDefaultTitle)) {
116 if (!dict->GetString(keys::kPageActionDefaultTitle, 118 if (!dict->GetString(keys::kPageActionDefaultTitle,
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 215
214 // static 216 // static
215 bool ActionInfo::IsVerboseInstallMessage(const Extension* extension) { 217 bool ActionInfo::IsVerboseInstallMessage(const Extension* extension) {
216 const ActionInfo* page_action_info = GetPageActionInfo(extension); 218 const ActionInfo* page_action_info = GetPageActionInfo(extension);
217 return page_action_info && 219 return page_action_info &&
218 (CommandsInfo::GetPageActionCommand(extension) || 220 (CommandsInfo::GetPageActionCommand(extension) ||
219 !page_action_info->default_icon.empty()); 221 !page_action_info->default_icon.empty());
220 } 222 }
221 223
222 } // namespace extensions 224 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698