ash/frame/frame_util.cc - Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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

OLD	NEW
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_state_delegate.h"	7 #include "ash/session/session_state_delegate.h"

	8 #include "ash/session/user_info.h"

8 #include "ash/shell.h"	9 #include "ash/shell.h"

9 #include "grit/ash_resources.h"	10 #include "grit/ash_resources.h"

10 #include "ui/base/resource/resource_bundle.h"	11 #include "ui/base/resource/resource_bundle.h"

11 #include "ui/gfx/image/image_skia.h"	12 #include "ui/gfx/image/image_skia.h"

12 #include "ui/gfx/image/image_skia_operations.h"	13 #include "ui/gfx/image/image_skia_operations.h"

13	14

14 namespace ash {	15 namespace ash {

15	16

16 gfx::Image GetAvatarImageForContext(content::BrowserContext* context) {	17 gfx::Image GetAvatarImageForContext(content::BrowserContext* context) {

17 static const gfx::ImageSkia* holder =	18 static const gfx::ImageSkia* holder =

18 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(	19 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

19 IDR_AVATAR_HOLDER);	20 IDR_AVATAR_HOLDER);

20 static const gfx::ImageSkia* holder_mask =	21 static const gfx::ImageSkia* holder_mask =

21 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(	22 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

22 IDR_AVATAR_HOLDER_MASK);	23 IDR_AVATAR_HOLDER_MASK);

23 gfx::ImageSkia user_image =	24 gfx::ImageSkia user_image = Shell::GetInstance()

24 Shell::GetInstance()->session_state_delegate()->GetUserImage(context);	25 ->session_state_delegate()

	26 ->GetUserInfo(context)

	27 ->GetImage();

25 gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage(	28 gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage(

26 user_image, skia::ImageOperations::RESIZE_BEST, holder->size());	29 user_image, skia::ImageOperations::RESIZE_BEST, holder->size());

27 gfx::ImageSkia masked =	30 gfx::ImageSkia masked =

28 gfx::ImageSkiaOperations::CreateMaskedImage(resized, *holder_mask);	31 gfx::ImageSkiaOperations::CreateMaskedImage(resized, *holder_mask);

29 gfx::ImageSkia result =	32 gfx::ImageSkia result =

30 gfx::ImageSkiaOperations::CreateSuperimposedImage(*holder, masked);	33 gfx::ImageSkiaOperations::CreateSuperimposedImage(*holder, masked);

31 return gfx::Image(result);	34 return gfx::Image(result);

32 }	35 }

33	36

34 } // namespace ash	37 } // namespace ash

35	38

OLD	NEW

« no previous file with comments | « ash/frame/custom_frame_view_ash.cc ('k') | ash/root_window_controller.cc » ('j') | ash/session/session_state_delegate_stub.h » ('J')