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

Side by Side Diff: chrome/common/extensions/extension.h

Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgot to update tests Created 8 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 | 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 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_ 5 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
6 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_ 6 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <iosfwd> 9 #include <iosfwd>
10 #include <map> 10 #include <map>
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 return converted_from_user_script_; 622 return converted_from_user_script_;
623 } 623 }
624 const UserScriptList& content_scripts() const { return content_scripts_; } 624 const UserScriptList& content_scripts() const { return content_scripts_; }
625 ExtensionAction* script_badge() const { return script_badge_.get(); } 625 ExtensionAction* script_badge() const { return script_badge_.get(); }
626 ExtensionAction* page_action() const { return page_action_.get(); } 626 ExtensionAction* page_action() const { return page_action_.get(); }
627 ExtensionAction* browser_action() const { return browser_action_.get(); } 627 ExtensionAction* browser_action() const { return browser_action_.get(); }
628 bool is_verbose_install_message() const { 628 bool is_verbose_install_message() const {
629 return !omnibox_keyword().empty() || 629 return !omnibox_keyword().empty() ||
630 browser_action() || 630 browser_action() ||
631 (page_action() && 631 (page_action() &&
632 (page_action_command() || 632 (page_action_command() || page_action()->default_icon()));
633 !page_action()->default_icon_path().empty()));
634 } 633 }
635 const FileBrowserHandlerList* file_browser_handlers() const { 634 const FileBrowserHandlerList* file_browser_handlers() const {
636 return file_browser_handlers_.get(); 635 return file_browser_handlers_.get();
637 } 636 }
638 const std::vector<PluginInfo>& plugins() const { return plugins_; } 637 const std::vector<PluginInfo>& plugins() const { return plugins_; }
639 const std::vector<NaClModuleInfo>& nacl_modules() const { 638 const std::vector<NaClModuleInfo>& nacl_modules() const {
640 return nacl_modules_; 639 return nacl_modules_;
641 } 640 }
642 const std::vector<InputComponentInfo>& input_components() const { 641 const std::vector<InputComponentInfo>& input_components() const {
643 return input_components_; 642 return input_components_;
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
1231 1230
1232 UpdatedExtensionPermissionsInfo( 1231 UpdatedExtensionPermissionsInfo(
1233 const Extension* extension, 1232 const Extension* extension,
1234 const PermissionSet* permissions, 1233 const PermissionSet* permissions,
1235 Reason reason); 1234 Reason reason);
1236 }; 1235 };
1237 1236
1238 } // namespace extensions 1237 } // namespace extensions
1239 1238
1240 #endif // CHROME_COMMON_EXTENSIONS_EXTENSION_H_ 1239 #endif // CHROME_COMMON_EXTENSIONS_EXTENSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698