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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/icon_loader_win.cc

Issue 659883002: Enable hidpi on Linux, refactor a bit on Windows to share Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win2 Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/display_info_provider_win.cc ('k') | chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc » ('j') | ui/base/resource/resource_bundle.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/icon_loader_win.cc
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc
index d0d77dc261039a16047a5e3f7a82a5c5de7c30bc..8a45286fc207efeeaa5d009cc5f090b16618da43 100644
--- a/chrome/browser/icon_loader_win.cc
+++ b/chrome/browser/icon_loader_win.cc
@@ -11,10 +11,10 @@
#include "base/message_loop/message_loop.h"
#include "base/threading/thread.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/dpi.h"
#include "ui/gfx/icon_util.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/size.h"
-#include "ui/gfx/win/dpi.h"
// static
IconGroupID IconLoader::ReadGroupIDFromFilepath(
@@ -61,8 +61,8 @@ void IconLoader::ReadIcon() {
scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(
file_info.hIcon));
if (bitmap.get()) {
- gfx::ImageSkia image_skia(gfx::ImageSkiaRep(
- *bitmap, gfx::win::GetDeviceScaleFactor()));
+ gfx::ImageSkia image_skia(
+ gfx::ImageSkiaRep(*bitmap, gfx::GetDeviceScaleFactor()));
image_skia.MakeThreadSafe();
image_.reset(new gfx::Image(image_skia));
DestroyIcon(file_info.hIcon);
« no previous file with comments | « chrome/browser/extensions/display_info_provider_win.cc ('k') | chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc » ('j') | ui/base/resource/resource_bundle.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698