summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 17:17:59 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 17:17:59 +0000
commit91059f84958779af809d61e4b9bd9301202cf215 (patch)
tree48bdb632fc374cacf4482284763b108d968f009f /chrome/common/extensions
parent65d903b23a639abd18cda24c50889be087fe909a (diff)
downloadchromium_src-91059f84958779af809d61e4b9bd9301202cf215.zip
chromium_src-91059f84958779af809d61e4b9bd9301202cf215.tar.gz
chromium_src-91059f84958779af809d61e4b9bd9301202cf215.tar.bz2
Restore the bookmark manager favicon.
The favicon used to be loaded from a png file in the resources directory. Since the file is gone, this no longer works. Instead, check for the bookmark manager extension earlier and load the image from the pak file. BUG=48218 Review URL: http://codereview.chromium.org/2960002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions')
-rw-r--r--chrome/common/extensions/extension_constants.cc4
-rw-r--r--chrome/common/extensions/extension_constants.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc
index 724198a..8bfa434 100644
--- a/chrome/common/extensions/extension_constants.cc
+++ b/chrome/common/extensions/extension_constants.cc
@@ -279,3 +279,7 @@ const char* kDecodedImagesFilename = "DECODED_IMAGES";
// extension_path.
const char* kDecodedMessageCatalogsFilename = "DECODED_MESSAGE_CATALOGS";
}
+
+namespace extension_misc {
+const char* kBookmarkManagerId = "eemcgdkfndhakfknompkggombfjjjeno";
+}
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index cc2a017..a8d508daf 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -201,6 +201,9 @@ namespace extension_filenames {
namespace extension_misc {
const int kUnknownWindowId = -1;
+
+ // The extension id of the bookmark manager.
+ extern const char* kBookmarkManagerId;
} // extension_misc
#endif // CHROME_COMMON_EXTENSIONS_EXTENSION_CONSTANTS_H_