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

Side by Side Diff: ash/shell/app_list.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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <string> 5 #include <string>
6 6
7 #include "ash/session_state_delegate.h" 7 #include "ash/session_state_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell/example_factory.h" 9 #include "ash/shell/example_factory.h"
10 #include "ash/shell/toplevel_window.h" 10 #include "ash/shell/toplevel_window.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 WindowTypeLauncherItem::Type type = 199 WindowTypeLauncherItem::Type type =
200 static_cast<WindowTypeLauncherItem::Type>(i); 200 static_cast<WindowTypeLauncherItem::Type>(i);
201 apps->Add(new WindowTypeLauncherItem(type)); 201 apps->Add(new WindowTypeLauncherItem(type));
202 } 202 }
203 } 203 }
204 204
205 gfx::ImageSkia CreateSearchBoxIcon() { 205 gfx::ImageSkia CreateSearchBoxIcon() {
206 const base::string16 icon_text = ASCIIToUTF16("ash"); 206 const base::string16 icon_text = ASCIIToUTF16("ash");
207 const gfx::Size icon_size(32, 32); 207 const gfx::Size icon_size(32, 32);
208 208
209 gfx::Canvas canvas(icon_size, ui::SCALE_FACTOR_100P, 209 gfx::Canvas canvas(icon_size, 1.0f, false /* is_opaque */);
210 false /* is_opaque */);
211 canvas.DrawStringInt(icon_text, 210 canvas.DrawStringInt(icon_text,
212 gfx::Font(), 211 gfx::Font(),
213 SK_ColorBLACK, 212 SK_ColorBLACK,
214 0, 0, icon_size.width(), icon_size.height(), 213 0, 0, icon_size.width(), icon_size.height(),
215 gfx::Canvas::TEXT_ALIGN_CENTER | 214 gfx::Canvas::TEXT_ALIGN_CENTER |
216 gfx::Canvas::NO_SUBPIXEL_RENDERING); 215 gfx::Canvas::NO_SUBPIXEL_RENDERING);
217 216
218 return gfx::ImageSkia(canvas.ExtractImageRep()); 217 return gfx::ImageSkia(canvas.ExtractImageRep());
219 } 218 }
220 219
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 }; 316 };
318 317
319 } // namespace 318 } // namespace
320 319
321 app_list::AppListViewDelegate* CreateAppListViewDelegate() { 320 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
322 return new ExampleAppListViewDelegate; 321 return new ExampleAppListViewDelegate;
323 } 322 }
324 323
325 } // namespace shell 324 } // namespace shell
326 } // namespace ash 325 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698