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

Side by Side Diff: ui/gfx/image/image.cc

Issue 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed unneeded include + rebase Created 9 years, 5 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/gfx/image/image.h" 5 #include "ui/gfx/image/image.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stl_util-inl.h" 10 #include "base/stl_util.h"
11 #include "third_party/skia/include/core/SkBitmap.h" 11 #include "third_party/skia/include/core/SkBitmap.h"
12 12
13 #if defined(TOOLKIT_USES_GTK) 13 #if defined(TOOLKIT_USES_GTK)
14 #include <gdk-pixbuf/gdk-pixbuf.h> 14 #include <gdk-pixbuf/gdk-pixbuf.h>
15 #include <glib-object.h> 15 #include <glib-object.h>
16 #include "ui/gfx/canvas_skia.h" 16 #include "ui/gfx/canvas_skia.h"
17 #include "ui/gfx/gtk_util.h" 17 #include "ui/gfx/gtk_util.h"
18 #elif defined(OS_MACOSX) 18 #elif defined(OS_MACOSX)
19 #include "base/mac/mac_util.h" 19 #include "base/mac/mac_util.h"
20 #include "skia/ext/skia_utils_mac.h" 20 #include "skia/ext/skia_utils_mac.h"
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 return GetRepresentation(Image::kImageRepSkia)->AsImageRepSkia()-> 383 return GetRepresentation(Image::kImageRepSkia)->AsImageRepSkia()->
384 bitmaps().size(); 384 bitmaps().size();
385 } 385 }
386 386
387 const SkBitmap* Image::GetSkBitmapAtIndex(size_t index) const { 387 const SkBitmap* Image::GetSkBitmapAtIndex(size_t index) const {
388 return GetRepresentation(Image::kImageRepSkia)->AsImageRepSkia()-> 388 return GetRepresentation(Image::kImageRepSkia)->AsImageRepSkia()->
389 bitmaps()[index]; 389 bitmaps()[index];
390 } 390 }
391 391
392 } // namespace gfx 392 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698