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

Side by Side Diff: chrome/browser/web_applications/web_app_mac.mm

Issue 534013002: Convert chrome_unscaled_resources to use a qualified path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
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"
11 #include "base/files/file_enumerator.h" 11 #include "base/files/file_enumerator.h"
12 #include "base/files/file_util.h" 12 #include "base/files/file_util.h"
13 #include "base/files/scoped_temp_dir.h" 13 #include "base/files/scoped_temp_dir.h"
14 #include "base/mac/foundation_util.h" 14 #include "base/mac/foundation_util.h"
15 #include "base/mac/launch_services_util.h" 15 #include "base/mac/launch_services_util.h"
16 #include "base/mac/mac_util.h" 16 #include "base/mac/mac_util.h"
17 #include "base/mac/scoped_cftyperef.h" 17 #include "base/mac/scoped_cftyperef.h"
18 #include "base/mac/scoped_nsobject.h" 18 #include "base/mac/scoped_nsobject.h"
19 #include "base/metrics/sparse_histogram.h" 19 #include "base/metrics/sparse_histogram.h"
20 #include "base/path_service.h" 20 #include "base/path_service.h"
21 #include "base/process/process_handle.h" 21 #include "base/process/process_handle.h"
22 #include "base/strings/string16.h" 22 #include "base/strings/string16.h"
23 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
24 #include "base/strings/string_split.h" 24 #include "base/strings/string_split.h"
25 #include "base/strings/string_util.h" 25 #include "base/strings/string_util.h"
26 #include "base/strings/sys_string_conversions.h" 26 #include "base/strings/sys_string_conversions.h"
27 #include "base/strings/utf_string_conversions.h" 27 #include "base/strings/utf_string_conversions.h"
28 #include "base/version.h" 28 #include "base/version.h"
29 #include "chrome/app/theme/grit/chrome_unscaled_resources.h"
29 #include "chrome/browser/browser_process.h" 30 #include "chrome/browser/browser_process.h"
30 #import "chrome/browser/mac/dock.h" 31 #import "chrome/browser/mac/dock.h"
31 #include "chrome/browser/profiles/profile.h" 32 #include "chrome/browser/profiles/profile.h"
32 #include "chrome/browser/profiles/profile_manager.h" 33 #include "chrome/browser/profiles/profile_manager.h"
33 #include "chrome/browser/shell_integration.h" 34 #include "chrome/browser/shell_integration.h"
34 #include "chrome/browser/ui/app_list/app_list_service.h" 35 #include "chrome/browser/ui/app_list/app_list_service.h"
35 #include "chrome/common/chrome_constants.h" 36 #include "chrome/common/chrome_constants.h"
36 #include "chrome/common/chrome_paths.h" 37 #include "chrome/common/chrome_paths.h"
37 #include "chrome/common/chrome_switches.h" 38 #include "chrome/common/chrome_switches.h"
38 #include "chrome/common/chrome_version_info.h" 39 #include "chrome/common/chrome_version_info.h"
39 #import "chrome/common/mac/app_mode_common.h" 40 #import "chrome/common/mac/app_mode_common.h"
40 #include "chrome/grit/generated_resources.h" 41 #include "chrome/grit/generated_resources.h"
41 #include "components/crx_file/id_util.h" 42 #include "components/crx_file/id_util.h"
42 #include "content/public/browser/browser_thread.h" 43 #include "content/public/browser/browser_thread.h"
43 #include "extensions/browser/extension_registry.h" 44 #include "extensions/browser/extension_registry.h"
44 #include "extensions/common/extension.h" 45 #include "extensions/common/extension.h"
45 #include "grit/chrome_unscaled_resources.h"
46 #import "skia/ext/skia_utils_mac.h" 46 #import "skia/ext/skia_utils_mac.h"
47 #include "third_party/skia/include/core/SkBitmap.h" 47 #include "third_party/skia/include/core/SkBitmap.h"
48 #include "third_party/skia/include/core/SkColor.h" 48 #include "third_party/skia/include/core/SkColor.h"
49 #include "ui/base/l10n/l10n_util.h" 49 #include "ui/base/l10n/l10n_util.h"
50 #import "ui/base/l10n/l10n_util_mac.h" 50 #import "ui/base/l10n/l10n_util_mac.h"
51 #include "ui/base/resource/resource_bundle.h" 51 #include "ui/base/resource/resource_bundle.h"
52 #include "ui/gfx/image/image_family.h" 52 #include "ui/gfx/image/image_family.h"
53 53
54 bool g_app_shims_allow_update_and_launch_in_tests = false; 54 bool g_app_shims_allow_update_and_launch_in_tests = false;
55 55
(...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 web_app::GetShortcutInfoForApp( 1102 web_app::GetShortcutInfoForApp(
1103 app, 1103 app,
1104 profile, 1104 profile,
1105 base::Bind(&web_app::CreateAppShortcutInfoLoaded, 1105 base::Bind(&web_app::CreateAppShortcutInfoLoaded,
1106 profile, 1106 profile,
1107 app, 1107 app,
1108 close_callback)); 1108 close_callback));
1109 } 1109 }
1110 1110
1111 } // namespace chrome 1111 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc ('k') | chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698