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

Side by Side Diff: ui/base/resource/resource_bundle.h

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
« no previous file with comments | « ui/base/models/menu_model.h ('k') | ui/base/resource/resource_bundle.cc » ('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) 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 #ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 5 #ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
6 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 6 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
11 #if defined(OS_WIN) 11 #if defined(OS_WIN)
12 #include <windows.h> 12 #include <windows.h>
13 #endif 13 #endif
14 14
15 #include <map> 15 #include <map>
16 #include <string> 16 #include <string>
17 #include <vector> 17 #include <vector>
18 18
19 #include "base/basictypes.h" 19 #include "base/basictypes.h"
20 #include "base/file_path.h" 20 #include "base/file_path.h"
21 #include "base/ref_counted_memory.h" 21 #include "base/ref_counted_memory.h"
22 #include "base/scoped_ptr.h" 22 #include "base/scoped_ptr.h"
23 #include "base/string16.h" 23 #include "base/string16.h"
24 #include "gfx/native_widget_types.h" 24 #include "ui/gfx/native_widget_types.h"
25 25
26 class SkBitmap; 26 class SkBitmap;
27 typedef uint32 SkColor; 27 typedef uint32 SkColor;
28 28
29 namespace base { 29 namespace base {
30 class Lock; 30 class Lock;
31 class StringPiece; 31 class StringPiece;
32 } 32 }
33 33
34 namespace gfx { 34 namespace gfx {
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 274
275 DISALLOW_COPY_AND_ASSIGN(ResourceBundle); 275 DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
276 }; 276 };
277 277
278 } // namespace ui 278 } // namespace ui
279 279
280 // TODO(beng): Someday, maybe, get rid of this. 280 // TODO(beng): Someday, maybe, get rid of this.
281 using ui::ResourceBundle; 281 using ui::ResourceBundle;
282 282
283 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 283 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
OLDNEW
« no previous file with comments | « ui/base/models/menu_model.h ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698