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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/user_image_source.cc

Issue 400973002: Move default user profile images strings and resources out of src/chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: split Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/ui/webui/options/chromeos/user_image_source.h" 5 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
6 6
7 #include "base/memory/ref_counted_memory.h" 7 #include "base/memory/ref_counted_memory.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/string_split.h" 9 #include "base/strings/string_split.h"
10 #include "chrome/browser/chromeos/login/users/avatar/default_user_images.h" 10 #include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
11 #include "chrome/browser/chromeos/login/users/user_manager.h" 11 #include "chrome/browser/chromeos/login/users/user_manager.h"
12 #include "chrome/common/url_constants.h" 12 #include "chrome/common/url_constants.h"
13 #include "grit/theme_resources.h" 13 #include "grit/theme_resources.h"
14 #include "grit/ui_chromeos_resources.h"
14 #include "net/base/escape.h" 15 #include "net/base/escape.h"
15 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/gfx/codec/png_codec.h" 17 #include "ui/gfx/codec/png_codec.h"
17 #include "url/url_parse.h" 18 #include "url/url_parse.h"
18 19
19 namespace { 20 namespace {
20 21
21 // Animated key is used in user image URL requests to specify that 22 // Animated key is used in user image URL requests to specify that
22 // animated version of user image is required. Without that key 23 // animated version of user image is required. Without that key
23 // non-animated version of user image should be returned. 24 // non-animated version of user image should be returned.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 if (is_image_animated) { 111 if (is_image_animated) {
111 const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email); 112 const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);
112 if (user && user->has_animated_image()) 113 if (user && user->has_animated_image())
113 return "image/gif"; 114 return "image/gif";
114 } 115 }
115 return "image/png"; 116 return "image/png";
116 } 117 }
117 118
118 } // namespace options 119 } // namespace options
119 } // namespace chromeos 120 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/users/avatar/default_user_images.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698