chrome/browser/chromeos/login/helper.cc - Issue 11418021: Revert 168079 - This CL ensures that favicons always

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: chrome/browser/chromeos/login/helper.cc

Issue 11418021: Revert 168079 - This CL ensures that favicons always (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 1 month 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 (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/chromeos/login/helper.h"	5 #include "chrome/browser/chromeos/login/helper.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/file_util.h"	9 #include "base/file_util.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

(...skipping 95 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 }	106 }

107 }	107 }

108	108

109 int GetCurrentUserImageSize() {	109 int GetCurrentUserImageSize() {

110 // The biggest size that the profile picture is displayed at is currently	110 // The biggest size that the profile picture is displayed at is currently

111 // 220px, used for the big preview on OOBE and Change Picture options page.	111 // 220px, used for the big preview on OOBE and Change Picture options page.

112 static const int kBaseUserImageSize = 220;	112 static const int kBaseUserImageSize = 220;

113 float scale_factor = gfx::Display::GetForcedDeviceScaleFactor();	113 float scale_factor = gfx::Display::GetForcedDeviceScaleFactor();

114 if (scale_factor > 1.0f)	114 if (scale_factor > 1.0f)

115 return static_cast<int>(scale_factor * kBaseUserImageSize);	115 return static_cast<int>(scale_factor * kBaseUserImageSize);

	116 // Use maximum supported scale factor.

116 return kBaseUserImageSize *	117 return kBaseUserImageSize *

117 ui::GetScaleFactorScale(ui::GetMaxScaleFactor());	118 ui::GetScaleFactorScale(ui::GetSupportedScaleFactors().back());

118 }	119 }

119	120

120 } // namespace chromeos	121 } // namespace chromeos

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/extensions/extension_install_prompt.cc » ('j') | no next file with comments »