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

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

Issue 2290753004: Finish changing chrome/ grit includes to use qualified paths. (Closed)
Patch Set: Rebase, fix new unqualified include Created 4 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 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 25 matching lines...) Expand all
36 #import "chrome/browser/mac/dock.h" 36 #import "chrome/browser/mac/dock.h"
37 #include "chrome/browser/profiles/profile.h" 37 #include "chrome/browser/profiles/profile.h"
38 #include "chrome/browser/profiles/profile_manager.h" 38 #include "chrome/browser/profiles/profile_manager.h"
39 #include "chrome/browser/shell_integration.h" 39 #include "chrome/browser/shell_integration.h"
40 #include "chrome/browser/ui/app_list/app_list_service.h" 40 #include "chrome/browser/ui/app_list/app_list_service.h"
41 #include "chrome/common/channel_info.h" 41 #include "chrome/common/channel_info.h"
42 #include "chrome/common/chrome_constants.h" 42 #include "chrome/common/chrome_constants.h"
43 #include "chrome/common/chrome_paths.h" 43 #include "chrome/common/chrome_paths.h"
44 #include "chrome/common/chrome_switches.h" 44 #include "chrome/common/chrome_switches.h"
45 #import "chrome/common/mac/app_mode_common.h" 45 #import "chrome/common/mac/app_mode_common.h"
46 #include "chrome/grit/chrome_unscaled_resources.h"
46 #include "chrome/grit/generated_resources.h" 47 #include "chrome/grit/generated_resources.h"
47 #include "components/crx_file/id_util.h" 48 #include "components/crx_file/id_util.h"
48 #include "components/version_info/version_info.h" 49 #include "components/version_info/version_info.h"
49 #include "content/public/browser/browser_thread.h" 50 #include "content/public/browser/browser_thread.h"
50 #include "content/public/common/content_switches.h" 51 #include "content/public/common/content_switches.h"
51 #include "extensions/browser/extension_registry.h" 52 #include "extensions/browser/extension_registry.h"
52 #include "extensions/common/extension.h" 53 #include "extensions/common/extension.h"
53 #include "grit/chrome_unscaled_resources.h"
54 #import "skia/ext/skia_utils_mac.h" 54 #import "skia/ext/skia_utils_mac.h"
55 #include "third_party/skia/include/core/SkBitmap.h" 55 #include "third_party/skia/include/core/SkBitmap.h"
56 #include "third_party/skia/include/core/SkColor.h" 56 #include "third_party/skia/include/core/SkColor.h"
57 #include "ui/base/l10n/l10n_util.h" 57 #include "ui/base/l10n/l10n_util.h"
58 #include "ui/base/resource/resource_bundle.h" 58 #include "ui/base/resource/resource_bundle.h"
59 #include "ui/gfx/image/image_family.h" 59 #include "ui/gfx/image/image_family.h"
60 60
61 bool g_app_shims_allow_update_and_launch_in_tests = false; 61 bool g_app_shims_allow_update_and_launch_in_tests = false;
62 62
63 namespace { 63 namespace {
(...skipping 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 BuildShortcutInfoFromBundle(*it); 1176 BuildShortcutInfoFromBundle(*it);
1177 WebAppShortcutCreator shortcut_creator(it->DirName(), shortcut_info.get(), 1177 WebAppShortcutCreator shortcut_creator(it->DirName(), shortcut_info.get(),
1178 extensions::FileHandlersInfo()); 1178 extensions::FileHandlersInfo());
1179 shortcut_creator.DeleteShortcuts(); 1179 shortcut_creator.DeleteShortcuts();
1180 } 1180 }
1181 } 1181 }
1182 1182
1183 } // namespace internals 1183 } // namespace internals
1184 1184
1185 } // namespace web_app 1185 } // namespace web_app
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698