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

Side by Side Diff: chrome/browser/icon_loader.h

Issue 8501030: aura: Make the Linux version of IconLoader not require GTK+. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move platform-specific include Created 9 years, 1 month 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 | « build/common.gypi ('k') | chrome/browser/icon_loader.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 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
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 scoped_refptr<base::MessageLoopProxy> target_message_loop_; 73 scoped_refptr<base::MessageLoopProxy> target_message_loop_;
74 74
75 IconGroupID group_; 75 IconGroupID group_;
76 76
77 IconSize icon_size_; 77 IconSize icon_size_;
78 78
79 scoped_ptr<gfx::Image> image_; 79 scoped_ptr<gfx::Image> image_;
80 80
81 Delegate* delegate_; 81 Delegate* delegate_;
82 82
83 #if defined(TOOLKIT_USES_GTK)
84 // On X11 we use gdk's pixbuf loader, which has to execute on the UI
85 // thread, so we only read the file on the background thread and parse it
86 // on the main thread.
87 void ParseIcon();
88 FilePath filename_;
89 std::string icon_data_;
90 #endif
91
92 DISALLOW_COPY_AND_ASSIGN(IconLoader); 83 DISALLOW_COPY_AND_ASSIGN(IconLoader);
93 }; 84 };
94 85
95 #endif // CHROME_BROWSER_ICON_LOADER_H_ 86 #endif // CHROME_BROWSER_ICON_LOADER_H_
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/icon_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698