Update App Launcher icons, splitting for Chromium, Chrome, Canary.

chrome/browser/ui/app_list/app_list_service.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/app_list_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #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... seeing how there is no
official builder trybot.. Although I'm reminded the bots will be no good anyway,
until the binaries are landed.

+#endif
 
 namespace {
 
 void SendAppListAppLaunch(int count) {
   UMA_HISTOGRAM_CUSTOM_COUNTS(
       "Apps.AppListDailyAppLaunches", count, 1, 1000, 50);
 }
 
 void SendAppListLaunch(int count) {
   UMA_HISTOGRAM_CUSTOM_COUNTS(
@@ skipping 89 matching lines @@
 // static
 void AppListService::SendAppListStats() {
   SendDailyEventFrequency(prefs::kLastAppListLaunchPing,
                           prefs::kAppListLaunchCount,
                           &SendAppListLaunch);
   SendDailyEventFrequency(prefs::kLastAppListAppLaunchPing,
                           prefs::kAppListAppLaunchCount,
                           &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() {}
 
 void AppListService::SetAppListProfile(
     const base::FilePath& profile_file_path) {}
 
 Profile* AppListService::GetCurrentAppListProfile() { return NULL; }
 
 bool AppListService::IsAppListVisible() const { return false; }
 
 void AppListService::OnProfileAdded(const base::FilePath& profilePath) {}
 
 void AppListService::OnProfileWillBeRemoved(
     const base::FilePath& profile_path) {}
 
 void AppListService::OnProfileWasRemoved(const base::FilePath& profile_path,
                                          const string16& profile_name) {}
 
 void AppListService::OnProfileNameChanged(const base::FilePath& profile_path,
                                           const string16& profile_name) {}
 
 void AppListService::OnProfileAvatarChanged(
     const base::FilePath& profile_path) {}
 
 AppListControllerDelegate* AppListService::CreateControllerDelegate() {
   return NULL;
 }