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

Unified Diff: chrome/browser/ui/app_list/app_list_service.cc

Issue 13947002: Update App Launcher icons, splitting for Chromium, Chrome, Canary. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: selfnits Created 7 years, 8 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
Index: chrome/browser/ui/app_list/app_list_service.cc
diff --git a/chrome/browser/ui/app_list/app_list_service.cc b/chrome/browser/ui/app_list/app_list_service.cc
index f02da1ee214cb4acb1c61c7b93d2ffd8f1310b7e..6a846d01544cae52affb5db638ce09e9bd389ebc 100644
--- a/chrome/browser/ui/app_list/app_list_service.cc
+++ b/chrome/browser/ui/app_list/app_list_service.cc
@@ -11,6 +11,11 @@
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/pref_names.h"
+#include "grit/theme_resources.h"
+
+#if defined(GOOGLE_CHROME_BUILD)
+#include "chrome/installer/util/install_util.h"
benwells 2013/04/09 22:34:44 This is a windows only component, I believe.
tapted 2013/04/10 06:36:37 You're right! That would have been embarrassing...
+#endif
namespace {
@@ -120,6 +125,16 @@ void AppListService::SendAppListStats() {
&SendAppListAppLaunch);
}
+// static
+int AppListService::GetAppListIconResourceId() {
+ int icon_id = IDR_APP_LIST;
+#if defined(GOOGLE_CHROME_BUILD)
+ if (InstallUtil::IsChromeSxSProcess())
+ icon_id = IDR_APP_LIST_SXS;
+#endif
+ return icon_id;
+}
+
void AppListService::ShowAppList(Profile* profile) {}
void AppListService::DismissAppList() {}

Powered by Google App Engine
This is Rietveld 408576698