OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/web_applications/web_app_ui.h" | 5 #include "chrome/browser/ui/web_applications/web_app_ui.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 #include "ui/gfx/image/image_family.h" | 36 #include "ui/gfx/image/image_family.h" |
37 #include "ui/gfx/image/image_skia.h" | 37 #include "ui/gfx/image/image_skia.h" |
38 | 38 |
39 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 39 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
40 #include "base/environment.h" | 40 #include "base/environment.h" |
41 #endif | 41 #endif |
42 | 42 |
43 #if defined(OS_WIN) | 43 #if defined(OS_WIN) |
44 #include "base/win/shortcut.h" | 44 #include "base/win/shortcut.h" |
45 #include "base/win/windows_version.h" | 45 #include "base/win/windows_version.h" |
| 46 #include "chrome/browser/web_applications/web_app_win.h" |
46 #include "ui/gfx/icon_util.h" | 47 #include "ui/gfx/icon_util.h" |
47 #endif | 48 #endif |
48 | 49 |
49 using content::BrowserThread; | 50 using content::BrowserThread; |
50 using content::NavigationController; | 51 using content::NavigationController; |
51 using content::WebContents; | 52 using content::WebContents; |
52 | 53 |
53 namespace { | 54 namespace { |
54 | 55 |
55 #if defined(OS_MACOSX) | 56 #if defined(OS_MACOSX) |
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
480 } | 481 } |
481 | 482 |
482 // |info_list| may still be empty at this point, in which case LoadImage | 483 // |info_list| may still be empty at this point, in which case LoadImage |
483 // will call the OnImageLoaded callback with an empty image and exit | 484 // will call the OnImageLoaded callback with an empty image and exit |
484 // immediately. | 485 // immediately. |
485 extensions::ImageLoader::Get(profile)->LoadImagesAsync(&extension, info_list, | 486 extensions::ImageLoader::Get(profile)->LoadImagesAsync(&extension, info_list, |
486 base::Bind(&OnImageLoaded, shortcut_info, callback)); | 487 base::Bind(&OnImageLoaded, shortcut_info, callback)); |
487 } | 488 } |
488 | 489 |
489 } // namespace web_app | 490 } // namespace web_app |
OLD | NEW |