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

Side by Side Diff: ash/frame/frame_util.cc

Issue 379803004: Move UserInfo to user_manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « ash/ash.gyp ('k') | ash/session/session_state_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/frame/frame_util.h" 5 #include "ash/frame/frame_util.h"
6 6
7 #include "ash/session/session_state_delegate.h" 7 #include "ash/session/session_state_delegate.h"
8 #include "ash/session/user_info.h"
9 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "components/user_manager/user_info.h"
10 #include "grit/ash_resources.h" 10 #include "grit/ash_resources.h"
11 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/image/image_skia.h" 12 #include "ui/gfx/image/image_skia.h"
13 #include "ui/gfx/image/image_skia_operations.h" 13 #include "ui/gfx/image/image_skia_operations.h"
14 14
15 namespace ash { 15 namespace ash {
16 16
17 gfx::Image GetAvatarImageForContext(content::BrowserContext* context) { 17 gfx::Image GetAvatarImageForContext(content::BrowserContext* context) {
18 static const gfx::ImageSkia* holder = 18 static const gfx::ImageSkia* holder =
19 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 19 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
20 IDR_AVATAR_HOLDER); 20 IDR_AVATAR_HOLDER);
21 static const gfx::ImageSkia* holder_mask = 21 static const gfx::ImageSkia* holder_mask =
22 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 22 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
23 IDR_AVATAR_HOLDER_MASK); 23 IDR_AVATAR_HOLDER_MASK);
24 gfx::ImageSkia user_image = Shell::GetInstance() 24 gfx::ImageSkia user_image = Shell::GetInstance()
25 ->session_state_delegate() 25 ->session_state_delegate()
26 ->GetUserInfo(context) 26 ->GetUserInfo(context)
27 ->GetImage(); 27 ->GetImage();
28 gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage( 28 gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage(
29 user_image, skia::ImageOperations::RESIZE_BEST, holder->size()); 29 user_image, skia::ImageOperations::RESIZE_BEST, holder->size());
30 gfx::ImageSkia masked = 30 gfx::ImageSkia masked =
31 gfx::ImageSkiaOperations::CreateMaskedImage(resized, *holder_mask); 31 gfx::ImageSkiaOperations::CreateMaskedImage(resized, *holder_mask);
32 gfx::ImageSkia result = 32 gfx::ImageSkia result =
33 gfx::ImageSkiaOperations::CreateSuperimposedImage(*holder, masked); 33 gfx::ImageSkiaOperations::CreateSuperimposedImage(*holder, masked);
34 return gfx::Image(result); 34 return gfx::Image(result);
35 } 35 }
36 36
37 } // namespace ash 37 } // namespace ash
38 38
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/session/session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698