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

Side by Side Diff: chrome/browser/ui/ash/session_util.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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/ash/session_util.h" 5 #include "chrome/browser/ui/ash/session_util.h"
6 6
7 #include "ash/common/wm_shell.h"
8 #include "ash/content/shell_content_state.h" 7 #include "ash/content/shell_content_state.h"
9 #include "ash/resources/grit/ash_resources.h" 8 #include "ash/resources/grit/ash_resources.h"
9 #include "ash/wm_shell.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "chrome/browser/chromeos/profiles/profile_helper.h" 11 #include "chrome/browser/chromeos/profiles/profile_helper.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "components/user_manager/user_manager.h" 14 #include "components/user_manager/user_manager.h"
15 #include "content/public/browser/browser_context.h" 15 #include "content/public/browser/browser_context.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/gfx/image/image_skia_operations.h" 18 #include "ui/gfx/image/image_skia_operations.h"
19 19
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 chromeos::ProfileHelper::Get() 56 chromeos::ProfileHelper::Get()
57 ->GetUserByProfile(Profile::FromBrowserContext(context)) 57 ->GetUserByProfile(Profile::FromBrowserContext(context))
58 ->GetImage(); 58 ->GetImage();
59 59
60 gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage( 60 gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage(
61 user_image, skia::ImageOperations::RESIZE_BEST, holder->size()); 61 user_image, skia::ImageOperations::RESIZE_BEST, holder->size());
62 gfx::ImageSkia masked = 62 gfx::ImageSkia masked =
63 gfx::ImageSkiaOperations::CreateMaskedImage(resized, *holder_mask); 63 gfx::ImageSkiaOperations::CreateMaskedImage(resized, *holder_mask);
64 return gfx::ImageSkiaOperations::CreateSuperimposedImage(*holder, masked); 64 return gfx::ImageSkiaOperations::CreateSuperimposedImage(*holder, masked);
65 } 65 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/shelf_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698