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

chrome/browser/ui/views/app_list/app_list_controller_win.cc

 // Copyright (c) 2012 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 <sstream>
 
 #include "apps/switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 29 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/util_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
-#include "grit/theme_resources.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/shell.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/widget/widget.h"
 #include "win8/util/win8_util.h"
 
+#if defined(GOOGLE_CHROME_BUILD)
+#include "chrome/installer/util/install_util.h"
+#endif
+
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #endif
 
 namespace {
 
 // Offset from the cursor to the point of the bubble arrow. It looks weird
 // if the arrow comes up right on top of the cursor, so it is offset by this
 // amount.
 static const int kAnchorOffset = 25;
 
 static const wchar_t kTrayClassName[] = L"Shell_TrayWnd";
 
 // Icons are added to the resources of the DLL using icon names. The icon index
-// for the app list icon is named IDR_X_APP_LIST. Creating shortcuts needs to
-// specify a resource index, which are different to icon names.  They are 0
-// based and contiguous. As Google Chrome builds have extra icons the icon for
-// Google Chrome builds need to be higher. Unfortunately these indexes are not
-// in any generated header file.
+// for the app list icon is named IDR_X_APP_LIST or (for official builds)
+// IDR_X_APP_LIST_SXS for Chrome Canary. Creating shortcuts needs to specify a
+// resource index, which are different to icon names.  They are 0 based and
+// contiguous. As Google Chrome builds have extra icons the icon for Google
+// Chrome builds need to be higher. Unfortunately these indexes are not in any
+// generated header file.
+int GetAppListIconIndex() {
+  const int kAppListIconIndex = 5;
+  const int kAppListIconIndexSxS = 6;
+  const int kAppListIconIndexChromium = 1;
 #if defined(GOOGLE_CHROME_BUILD)
-const int kAppListIconIndex = 5;
+  if (InstallUtil::IsChromeSxSProcess())
+    return kAppListIconIndexSxS;
+  return kAppListIconIndex;
 #else
-const int kAppListIconIndex = 1;
+  return kAppListIconIndexChromium;
 #endif
+}
 
 CommandLine GetAppListCommandLine() {
   const char* const kSwitchesToCopy[] = { switches::kUserDataDir };
   CommandLine* current = CommandLine::ForCurrentProcess();
   CommandLine command_line(current->GetProgram());
   command_line.CopySwitchesFrom(*current, kSwitchesToCopy,
                                 arraysize(kSwitchesToCopy));
   command_line.AppendSwitch(switches::kShowAppList);
   return command_line;
 }
@@ skipping 61 matching lines @@
  public:
   ScopedKeepAlive();
   ~ScopedKeepAlive();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedKeepAlive);
 };
 
 // The AppListController class manages global resources needed for the app
 // list to operate, and controls when the app list is opened and closed.
 // TODO(tapted): Rename this class to AppListServiceWin and move entire file to

[tapted, 2013/04/10 06:36:38]

Hrm. Still need to do this. This will make app_list_controller_win.cc a bit more
compelling.. I considered making a start now, with a (still abstract) class
AppListControllerWin, but decided against it.

 // chrome/browser/ui/app_list/app_list_service_win.cc after removing
 // chrome/browser/ui/views dependency.
 class AppListController : public AppListService {
  public:
   virtual ~AppListController();
 
   static AppListController* GetInstance() {
     return Singleton<AppListController,
                      LeakySingletonTraits<AppListController> >::get();
   }
@@ skipping 147 matching lines @@
   AppListController::GetInstance()->AppListClosing();
 }
 
 gfx::NativeWindow AppListControllerDelegateWin::GetAppListWindow() {
   app_list::AppListView* view = AppListController::GetInstance()->GetView();
   return view ? view->GetWidget()->GetNativeWindow() : NULL;
 }
 
 gfx::ImageSkia AppListControllerDelegateWin::GetWindowIcon() {
   gfx::ImageSkia* resource = ResourceBundle::GetSharedInstance().
-      GetImageSkiaNamed(IDR_APP_LIST);
+      GetImageSkiaNamed(chrome::GetAppListIconResourceId());
   return *resource;
 }
 
 bool AppListControllerDelegateWin::CanPin() {
   return false;
 }
 
 void AppListControllerDelegateWin::OnShowExtensionPrompt() {
   AppListController::GetInstance()->set_can_close(false);
 }
@@ skipping 372 matching lines @@
 }
 
 string16 AppListController::GetAppListIconPath() {
   base::FilePath icon_path;
   if (!PathService::Get(base::FILE_EXE, &icon_path)) {
     NOTREACHED();
     return string16();
   }
 
   std::stringstream ss;
-  ss << "," << kAppListIconIndex;
+  ss << "," << GetAppListIconIndex();
   string16 result = icon_path.value();
   result.append(UTF8ToUTF16(ss.str()));
   return result;
 }
 
 void AppListController::CheckTaskbarOrViewHasFocus() {
   // Remember if the taskbar had focus without the right mouse button being
   // down.
   bool was_preserving_focus = preserving_focus_for_taskbar_menu_;
   preserving_focus_for_taskbar_menu_ = false;
@@ skipping 113 matching lines @@
 
   base::win::ShortcutProperties shortcut_properties;
   shortcut_properties.set_target(chrome_exe);
   shortcut_properties.set_working_dir(chrome_exe.DirName());
 
   string16 wide_switches(GetAppListCommandLine().GetArgumentsString());
   shortcut_properties.set_arguments(wide_switches);
   shortcut_properties.set_description(l10n_util::GetStringUTF16(
       IDS_APP_LIST_SHORTCUT_NAME));
 
-  shortcut_properties.set_icon(chrome_exe, kAppListIconIndex);
+  shortcut_properties.set_icon(chrome_exe, GetAppListIconIndex());
   shortcut_properties.set_app_id(app_model_id);
 
   const base::FilePath shortcut_path(
       GetAppListTaskbarShortcutPath(user_data_dir));
   base::win::CreateOrUpdateShortcutLink(shortcut_path, shortcut_properties,
                                         base::win::SHORTCUT_CREATE_ALWAYS);
 
   if (!base::win::TaskbarPinShortcutLink(shortcut_path.value().c_str()))
     LOG(WARNING) << "Failed to pin AppList using " << shortcut_path.value();
 }
@@ skipping 98 matching lines @@
 
 }  // namespace
 
 namespace chrome {
 
 AppListService* GetAppListServiceWin() {
   return AppListController::GetInstance();
 }
 
 }  // namespace chrome