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

Unified Diff: chrome/browser/extensions/component_loader.cc

Issue 12090110: Show an icon to launch Chrome (chrome_app) on the Windows App Launcher. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix case where chrome is not default browser, fix ordering Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/chrome_app/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 53e7e73d5e0e28883a74e30d6e3e7bf6a0b5644e..482339c758dbe94ba7c55a123540d3a5714e0a3e 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -34,7 +34,7 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#endif
-#if defined(USE_ASH)
+#if defined(ENABLE_APP_LIST)
#include "grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
#endif
@@ -293,7 +293,7 @@ void ComponentLoader::AddOrReloadEnterpriseWebStore() {
}
void ComponentLoader::AddChromeApp() {
-#if defined(USE_ASH)
+#if defined(ENABLE_APP_LIST)
std::string manifest_contents =
ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_CHROME_APP_MANIFEST).as_string();
@@ -360,9 +360,7 @@ void ComponentLoader::AddDefaultComponentExtensions(
// the browser process has started.
AddOrReloadEnterpriseWebStore();
-#if defined(USE_ASH)
AddChromeApp();
-#endif
}
AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components);
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/chrome_app/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698