OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/profiles/profile_info_cache.h" | 5 #include "chrome/browser/profiles/profile_info_cache.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/i18n/case_conversion.h" | 9 #include "base/i18n/case_conversion.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/prefs/pref_registry_simple.h" | 12 #include "base/prefs/pref_registry_simple.h" |
13 #include "base/prefs/pref_service.h" | 13 #include "base/prefs/pref_service.h" |
14 #include "base/prefs/scoped_user_pref_update.h" | 14 #include "base/prefs/scoped_user_pref_update.h" |
15 #include "base/rand_util.h" | 15 #include "base/rand_util.h" |
16 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
17 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
18 #include "base/strings/string_piece.h" | 18 #include "base/strings/string_piece.h" |
19 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
20 #include "base/values.h" | 20 #include "base/values.h" |
21 #include "chrome/browser/browser_process.h" | 21 #include "chrome/browser/browser_process.h" |
22 #include "chrome/browser/chrome_notification_types.h" | 22 #include "chrome/browser/chrome_notification_types.h" |
23 #include "chrome/browser/profiles/profile_avatar_downloader.h" | 23 #include "chrome/browser/profiles/profile_avatar_downloader.h" |
24 #include "chrome/browser/profiles/profile_avatar_icon_util.h" | 24 #include "chrome/browser/profiles/profile_avatar_icon_util.h" |
25 #include "chrome/browser/profiles/profiles_state.h" | 25 #include "chrome/browser/profiles/profiles_state.h" |
26 #include "chrome/common/pref_names.h" | 26 #include "chrome/common/pref_names.h" |
| 27 #include "chrome/grit/generated_resources.h" |
27 #include "components/signin/core/common/profile_management_switches.h" | 28 #include "components/signin/core/common/profile_management_switches.h" |
28 #include "content/public/browser/browser_thread.h" | 29 #include "content/public/browser/browser_thread.h" |
29 #include "content/public/browser/notification_service.h" | 30 #include "content/public/browser/notification_service.h" |
30 #include "grit/generated_resources.h" | |
31 #include "grit/theme_resources.h" | 31 #include "grit/theme_resources.h" |
32 #include "ui/base/l10n/l10n_util.h" | 32 #include "ui/base/l10n/l10n_util.h" |
33 #include "ui/base/resource/resource_bundle.h" | 33 #include "ui/base/resource/resource_bundle.h" |
34 #include "ui/gfx/image/image.h" | 34 #include "ui/gfx/image/image.h" |
35 #include "ui/gfx/image/image_util.h" | 35 #include "ui/gfx/image/image_util.h" |
36 | 36 |
37 using content::BrowserThread; | 37 using content::BrowserThread; |
38 | 38 |
39 namespace { | 39 namespace { |
40 | 40 |
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1060 OnProfileAvatarChanged(profile_path)); | 1060 OnProfileAvatarChanged(profile_path)); |
1061 | 1061 |
1062 // Remove the file from the list of downloads in progress. Note that this list | 1062 // Remove the file from the list of downloads in progress. Note that this list |
1063 // only contains the high resolution avatars, and not the Gaia profile images. | 1063 // only contains the high resolution avatars, and not the Gaia profile images. |
1064 if (!avatar_images_downloads_in_progress_[file_name]) | 1064 if (!avatar_images_downloads_in_progress_[file_name]) |
1065 return; | 1065 return; |
1066 | 1066 |
1067 delete avatar_images_downloads_in_progress_[file_name]; | 1067 delete avatar_images_downloads_in_progress_[file_name]; |
1068 avatar_images_downloads_in_progress_[file_name] = NULL; | 1068 avatar_images_downloads_in_progress_[file_name] = NULL; |
1069 } | 1069 } |
OLD | NEW |