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

Side by Side Diff: chrome/browser/icon_loader_chromeos.cc

Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
« no previous file with comments | « chrome/browser/icon_loader.cc ('k') | chrome/browser/icon_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/icon_loader.h" 5 #include "chrome/browser/icon_loader.h"
6 6
7 #include <stddef.h>
8
7 #include <map> 9 #include <map>
8 #include <string> 10 #include <string>
9 #include <utility> 11 #include <utility>
10 12
11 #include "base/bind.h" 13 #include "base/bind.h"
12 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
13 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
16 #include "base/macros.h"
14 #include "base/memory/ref_counted_memory.h" 17 #include "base/memory/ref_counted_memory.h"
15 #include "base/message_loop/message_loop.h" 18 #include "base/message_loop/message_loop.h"
16 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
17 #include "chrome/browser/icon_loader.h" 20 #include "chrome/browser/icon_loader.h"
18 #include "grit/theme_resources.h" 21 #include "grit/theme_resources.h"
19 #include "third_party/skia/include/core/SkBitmap.h" 22 #include "third_party/skia/include/core/SkBitmap.h"
20 #include "ui/base/layout.h" 23 #include "ui/base/layout.h"
21 #include "ui/base/resource/resource_bundle.h" 24 #include "ui/base/resource/resource_bundle.h"
22 #include "ui/gfx/canvas.h" 25 #include "ui/gfx/canvas.h"
23 #include "ui/gfx/codec/png_codec.h" 26 #include "ui/gfx/codec/png_codec.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 LAZY_INSTANCE_INITIALIZER; 204 LAZY_INSTANCE_INITIALIZER;
202 int idr = icon_mapper.Get().Lookup(group_, icon_size_); 205 int idr = icon_mapper.Get().Lookup(group_, icon_size_);
203 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 206 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
204 gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(), 207 gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(),
205 IconSizeToDIPSize(icon_size_))); 208 IconSizeToDIPSize(icon_size_)));
206 image_skia.MakeThreadSafe(); 209 image_skia.MakeThreadSafe();
207 image_.reset(new gfx::Image(image_skia)); 210 image_.reset(new gfx::Image(image_skia));
208 target_task_runner_->PostTask( 211 target_task_runner_->PostTask(
209 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); 212 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
210 } 213 }
OLDNEW
« no previous file with comments | « chrome/browser/icon_loader.cc ('k') | chrome/browser/icon_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698