diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-09 11:47:42 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 14:33:03 +0100 |
| commit | dc0f95d653279beabeb9817299e2902918ba123e (patch) | |
| tree | 32eb121cd532053a5b9cb0c390331349af8d6baa /chrome/browser/icon_loader_win.cc | |
| parent | ba160cd4054d13d0cb0b1b46e61c3bed67095811 (diff) | |
| download | external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.zip external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.gz external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.bz2 | |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
Diffstat (limited to 'chrome/browser/icon_loader_win.cc')
| -rw-r--r-- | chrome/browser/icon_loader_win.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc index 717c15b..eeeedb0 100644 --- a/chrome/browser/icon_loader_win.cc +++ b/chrome/browser/icon_loader_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -42,7 +42,8 @@ void IconLoader::ReadIcon() { DCHECK(r); gfx::Size icon_size(bitmap_info.bmWidth, bitmap_info.bmHeight); - bitmap_.Set(IconUtil::CreateSkBitmapFromHICON(file_info.hIcon, icon_size)); + image_.reset(new gfx::Image( + IconUtil::CreateSkBitmapFromHICON(file_info.hIcon, icon_size))); target_message_loop_->PostTask(FROM_HERE, NewRunnableMethod(this, &IconLoader::NotifyDelegate)); |