ash/shell/window_watcher.cc - Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx

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

Unified Diff: ash/shell/window_watcher.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: ash/shell/window_watcher.cc

diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc

index 4dfcea4e57746993c3b900acb0fd50d8a039c4e8..f076483a1e62fbdab863882894aaa458101538bb 100644

--- a/ash/shell/window_watcher.cc

+++ b/ash/shell/window_watcher.cc

@@ -118,8 +118,7 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) {

image_count == 1 ? 255 : 0,

image_count == 2 ? 255 : 0);

image_count = (image_count + 1) % 3;

- item.image = gfx::ImageSkia(gfx::ImageSkiaRep(icon_bitmap,

- ui::SCALE_FACTOR_100P));

+ item.image = gfx::ImageSkia(gfx::ImageSkiaRep(icon_bitmap, 1.0f));

model->Add(item);

}