Create profile .ico file on profile creation

chrome/browser/profiles/profile_impl.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 "chrome/browser/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 141 matching lines @@
 // not in resources.
 static const char kReadmeText[] =
     "%s settings and storage represent user-selected preferences and "
     "information and MUST not be extracted, overwritten or modified except "
     "through %s defined APIs.";
 
 // Value written to prefs for EXIT_CRASHED and EXIT_SESSION_ENDED.
 const char* const kPrefExitTypeCrashed = "Crashed";
 const char* const kPrefExitTypeSessionEnded = "SessionEnded";
 
+#if defined(OS_WIN)
+const int kCurrentProfileIconVersion = 1;
+#endif
+
 // Helper method needed because PostTask cannot currently take a Callback
 // function with non-void return type.
 void CreateDirectoryAndSignal(const base::FilePath& path,
                               base::WaitableEvent* done_creating) {
   DVLOG(1) << "Creating directory " << path.value();
   file_util::CreateDirectory(path);
   done_creating->Signal();
 }
 
 // Task that blocks the FILE thread until CreateDirectoryAndSignal() finishes on
@@ skipping 175 matching lines @@
     base::SequencedTaskRunner* sequenced_task_runner)
     : zoom_callback_(base::Bind(&ProfileImpl::OnZoomLevelChanged,
                                 base::Unretained(this))),
       path_(path),
       pref_registry_(new user_prefs::PrefRegistrySyncable),
       io_data_(this),
       host_content_settings_map_(NULL),
       last_session_exit_type_(EXIT_NORMAL),
       start_time_(Time::Now()),
       delegate_(delegate),
-      predictor_(NULL) {
+      predictor_(NULL),
+      weak_ptr_factory_(this) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
 
 #if defined(ENABLE_SESSION_SERVICE)
   create_session_service_timer_.Start(FROM_HERE,
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
 #endif
 
   // Determine if prefetch is enabled for this profile.
@@ skipping 358 matching lines @@
           EXIT_NORMAL : EXIT_CRASHED;
   } else {
     last_session_exit_type_ =
         SessionTypePrefValueToExitType(exit_type_pref_value);
   }
   // Mark the session as open.
   prefs_->SetString(prefs::kSessionExitType, kPrefExitTypeCrashed);
   // Force this to true in case we fallback and use it.
   // TODO(sky): remove this in a couple of releases (m28ish).
   prefs_->SetBoolean(prefs::kSessionExitedCleanly, true);
+#if defined(OS_WIN)
+  if (prefs_->GetInteger(prefs::kProfileIconVersion) <

[Alexei Svitkine (slow), 2013/06/05 14:06:03]

I would prefer if you refactor this into a helper function, that way it can live
next to OnProfileIconCreateSuccess().

[calamity, 2013/06/07 04:26:26]

Done.

+      kCurrentProfileIconVersion) {
+    // Ensure the profile's icon file has been created.
+    ProfileShortcutManager* profile_shortcut_manager =
+        g_browser_process->profile_manager()->profile_shortcut_manager();
+    if (profile_shortcut_manager) {
+      profile_shortcut_manager->CreateProfileIcon(
+          GetPath(),
+          base::Bind(&ProfileImpl::OnProfileIconCreateSuccess,
+                     weak_ptr_factory_.GetWeakPtr()));
+    }
+  }
+#endif
 
   BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
       this, false);
 
   DCHECK(!net_pref_observer_);
   net_pref_observer_.reset(new NetPrefObserver(
       prefs_.get(),
       prerender::PrerenderManagerFactory::GetForProfile(this),
       predictor_));
 
   ChromeVersionService::OnProfileLoaded(prefs_.get(), IsNewProfile());
   DoFinalInit();
 }
 
+void ProfileImpl::OnProfileIconCreateSuccess() {
+  prefs_->SetInteger(prefs::kProfileIconVersion, kCurrentProfileIconVersion);
+}
+
 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) {
   Version profile_version(ChromeVersionService::GetVersion(prefs_.get()));
   Version arg_version(version);
   return (profile_version.CompareTo(arg_version) >= 0);
 }
 
 void ProfileImpl::SetExitType(ExitType exit_type) {
   if (!prefs_)
     return;
   ExitType current_exit_type = SessionTypePrefValueToExitType(
@@ skipping 377 matching lines @@
                                      base::FilePath* cache_path,
                                      int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
   base::FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }