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

Side by Side Diff: chrome/browser/icon_loader.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 | « chrome/browser/history/top_sites_unittest.cc ('k') | chrome/browser/icon_loader_linux.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 CHROME_BROWSER_ICON_LOADER_H_ 5 #ifndef CHROME_BROWSER_ICON_LOADER_H_
6 #define CHROME_BROWSER_ICON_LOADER_H_ 6 #define CHROME_BROWSER_ICON_LOADER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
11 #include <string> 11 #include <string>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/message_loop_proxy.h" 14 #include "base/message_loop_proxy.h"
15 #include "base/ref_counted.h" 15 #include "base/ref_counted.h"
16 #include "gfx/scoped_image.h" 16 #include "ui/gfx/scoped_image.h"
17 17
18 #if defined(TOOLKIT_USES_GTK) 18 #if defined(TOOLKIT_USES_GTK)
19 #include "base/file_path.h" 19 #include "base/file_path.h"
20 #endif 20 #endif
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 // On Windows, we group files by their extension, with several exceptions: 23 // On Windows, we group files by their extension, with several exceptions:
24 // .dll, .exe, .ico. See IconManager.h for explanation. 24 // .dll, .exe, .ico. See IconManager.h for explanation.
25 typedef std::wstring IconGroupID; 25 typedef std::wstring IconGroupID;
26 #elif defined(OS_POSIX) 26 #elif defined(OS_POSIX)
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // on the main thread. 87 // on the main thread.
88 void ParseIcon(); 88 void ParseIcon();
89 FilePath filename_; 89 FilePath filename_;
90 std::string icon_data_; 90 std::string icon_data_;
91 #endif 91 #endif
92 92
93 DISALLOW_COPY_AND_ASSIGN(IconLoader); 93 DISALLOW_COPY_AND_ASSIGN(IconLoader);
94 }; 94 };
95 95
96 #endif // CHROME_BROWSER_ICON_LOADER_H_ 96 #endif // CHROME_BROWSER_ICON_LOADER_H_
OLDNEW
« no previous file with comments | « chrome/browser/history/top_sites_unittest.cc ('k') | chrome/browser/icon_loader_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698