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

Side by Side Diff: ui/base/resource/resource_bundle.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/base/resource/resource_bundle.h" 5 #include "ui/base/resource/resource_bundle.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util-inl.h" 8 #include "base/stl_util.h"
9 #include "base/string_piece.h" 9 #include "base/string_piece.h"
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "third_party/skia/include/core/SkBitmap.h" 12 #include "third_party/skia/include/core/SkBitmap.h"
13 #include "ui/base/resource/data_pack.h" 13 #include "ui/base/resource/data_pack.h"
14 #include "ui/gfx/codec/png_codec.h" 14 #include "ui/gfx/codec/png_codec.h"
15 #include "ui/gfx/font.h" 15 #include "ui/gfx/font.h"
16 #include "ui/gfx/image/image.h" 16 #include "ui/gfx/image/image.h"
17 17
18 namespace ui { 18 namespace ui {
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 } 295 }
296 296
297 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory( 297 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory(
298 int resource_id) const { 298 int resource_id) const {
299 if (!data_pack_.get()) 299 if (!data_pack_.get())
300 return NULL; 300 return NULL;
301 return data_pack_->GetStaticMemory(resource_id); 301 return data_pack_->GetStaticMemory(resource_id);
302 } 302 }
303 303
304 } // namespace ui 304 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698