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

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: cocoa 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 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 return converted_from_user_script_; 610 return converted_from_user_script_;
611 } 611 }
612 const UserScriptList& content_scripts() const { return content_scripts_; } 612 const UserScriptList& content_scripts() const { return content_scripts_; }
613 ExtensionAction* script_badge() const { return script_badge_.get(); } 613 ExtensionAction* script_badge() const { return script_badge_.get(); }
614 ExtensionAction* page_action() const { return page_action_.get(); } 614 ExtensionAction* page_action() const { return page_action_.get(); }
615 ExtensionAction* browser_action() const { return browser_action_.get(); } 615 ExtensionAction* browser_action() const { return browser_action_.get(); }
616 bool is_verbose_install_message() const { 616 bool is_verbose_install_message() const {
617 return !omnibox_keyword().empty() || 617 return !omnibox_keyword().empty() ||
618 browser_action() || 618 browser_action() ||
619 (page_action() && 619 (page_action() &&
620 (page_action_command() || 620 (page_action_command() || page_action()->default_icon()));
621 !page_action()->default_icon_path().empty()));
622 } 621 }
623 const FileBrowserHandlerList* file_browser_handlers() const { 622 const FileBrowserHandlerList* file_browser_handlers() const {
624 return file_browser_handlers_.get(); 623 return file_browser_handlers_.get();
625 } 624 }
626 const std::vector<PluginInfo>& plugins() const { return plugins_; } 625 const std::vector<PluginInfo>& plugins() const { return plugins_; }
627 const std::vector<NaClModuleInfo>& nacl_modules() const { 626 const std::vector<NaClModuleInfo>& nacl_modules() const {
628 return nacl_modules_; 627 return nacl_modules_;
629 } 628 }
630 const std::vector<InputComponentInfo>& input_components() const { 629 const std::vector<InputComponentInfo>& input_components() const {
631 return input_components_; 630 return input_components_;
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 1213
1215 UpdatedExtensionPermissionsInfo( 1214 UpdatedExtensionPermissionsInfo(
1216 const Extension* extension, 1215 const Extension* extension,
1217 const PermissionSet* permissions, 1216 const PermissionSet* permissions,
1218 Reason reason); 1217 Reason reason);
1219 }; 1218 };
1220 1219
1221 } // namespace extensions 1220 } // namespace extensions
1222 1221
1223 #endif // CHROME_COMMON_EXTENSIONS_EXTENSION_H_ 1222 #endif // CHROME_COMMON_EXTENSIONS_EXTENSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698