| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 MessageLoop* target_message_loop_; | 61 MessageLoop* target_message_loop_; |
| 62 | 62 |
| 63 IconGroupID group_; | 63 IconGroupID group_; |
| 64 | 64 |
| 65 IconSize icon_size_; | 65 IconSize icon_size_; |
| 66 | 66 |
| 67 SkBitmap* bitmap_; | 67 SkBitmap* bitmap_; |
| 68 | 68 |
| 69 Delegate* delegate_; | 69 Delegate* delegate_; |
| 70 | 70 |
| 71 #if defined(OS_LINUX) | 71 #if defined(USE_X11) |
| 72 // On Linux we use gdk's pixbuf loader, which has to execute on the UI | 72 // On X/11 systems we use gdk's pixbuf loader, which has to execute on the UI |
| 73 // thread, so we only read the file on the background thread and parse it | 73 // thread, so we only read the file on the background thread and parse it |
| 74 // on the main thread. | 74 // on the main thread. |
| 75 void ParseIcon(); | 75 void ParseIcon(); |
| 76 FilePath filename_; | 76 FilePath filename_; |
| 77 std::string icon_data_; | 77 std::string icon_data_; |
| 78 #endif | 78 #endif |
| 79 | 79 |
| 80 DISALLOW_COPY_AND_ASSIGN(IconLoader); | 80 DISALLOW_COPY_AND_ASSIGN(IconLoader); |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 #endif // CHROME_BROWSER_ICON_LOADER_H_ | 83 #endif // CHROME_BROWSER_ICON_LOADER_H_ |
| OLD | NEW |