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 #import "chrome/browser/web_applications/web_app_mac.h" | 5 #import "chrome/browser/web_applications/web_app_mac.h" |
6 | 6 |
7 #import <Carbon/Carbon.h> | 7 #import <Carbon/Carbon.h> |
8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "chrome/browser/ui/app_list/app_list_service.h" | 35 #include "chrome/browser/ui/app_list/app_list_service.h" |
36 #include "chrome/common/chrome_constants.h" | 36 #include "chrome/common/chrome_constants.h" |
37 #include "chrome/common/chrome_paths.h" | 37 #include "chrome/common/chrome_paths.h" |
38 #include "chrome/common/chrome_switches.h" | 38 #include "chrome/common/chrome_switches.h" |
39 #include "chrome/common/chrome_version_info.h" | 39 #include "chrome/common/chrome_version_info.h" |
40 #import "chrome/common/mac/app_mode_common.h" | 40 #import "chrome/common/mac/app_mode_common.h" |
41 #include "content/public/browser/browser_thread.h" | 41 #include "content/public/browser/browser_thread.h" |
42 #include "extensions/browser/extension_registry.h" | 42 #include "extensions/browser/extension_registry.h" |
43 #include "extensions/common/extension.h" | 43 #include "extensions/common/extension.h" |
44 #include "grit/chrome_unscaled_resources.h" | 44 #include "grit/chrome_unscaled_resources.h" |
45 #include "grit/chromium_strings.h" | |
46 #include "grit/generated_resources.h" | 45 #include "grit/generated_resources.h" |
47 #import "skia/ext/skia_utils_mac.h" | 46 #import "skia/ext/skia_utils_mac.h" |
48 #include "third_party/skia/include/core/SkBitmap.h" | 47 #include "third_party/skia/include/core/SkBitmap.h" |
49 #include "third_party/skia/include/core/SkColor.h" | 48 #include "third_party/skia/include/core/SkColor.h" |
50 #include "ui/base/l10n/l10n_util.h" | 49 #include "ui/base/l10n/l10n_util.h" |
51 #import "ui/base/l10n/l10n_util_mac.h" | 50 #import "ui/base/l10n/l10n_util_mac.h" |
52 #include "ui/base/resource/resource_bundle.h" | 51 #include "ui/base/resource/resource_bundle.h" |
53 #include "ui/gfx/image/image_family.h" | 52 #include "ui/gfx/image/image_family.h" |
54 | 53 |
55 bool g_app_shims_allow_update_and_launch_in_tests = false; | 54 bool g_app_shims_allow_update_and_launch_in_tests = false; |
(...skipping 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1103 web_app::GetShortcutInfoForApp( | 1102 web_app::GetShortcutInfoForApp( |
1104 app, | 1103 app, |
1105 profile, | 1104 profile, |
1106 base::Bind(&web_app::CreateAppShortcutInfoLoaded, | 1105 base::Bind(&web_app::CreateAppShortcutInfoLoaded, |
1107 profile, | 1106 profile, |
1108 app, | 1107 app, |
1109 close_callback)); | 1108 close_callback)); |
1110 } | 1109 } |
1111 | 1110 |
1112 } // namespace chrome | 1111 } // namespace chrome |
OLD | NEW |