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

Side by Side Diff: chrome/browser/extensions/crx_installer.cc

Issue 514493002: Cleanup: Remove unneeded grit include in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@grit_clean_chromium_strings_401588_a
Patch Set: rebase 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 #include "chrome/browser/extensions/crx_installer.h" 5 #include "chrome/browser/extensions/crx_installer.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/extensions/extension_service.h" 30 #include "chrome/browser/extensions/extension_service.h"
31 #include "chrome/browser/extensions/install_tracker.h" 31 #include "chrome/browser/extensions/install_tracker.h"
32 #include "chrome/browser/extensions/install_tracker_factory.h" 32 #include "chrome/browser/extensions/install_tracker_factory.h"
33 #include "chrome/browser/extensions/permissions_updater.h" 33 #include "chrome/browser/extensions/permissions_updater.h"
34 #include "chrome/browser/extensions/webstore_installer.h" 34 #include "chrome/browser/extensions/webstore_installer.h"
35 #include "chrome/browser/profiles/profile.h" 35 #include "chrome/browser/profiles/profile.h"
36 #include "chrome/browser/web_applications/web_app.h" 36 #include "chrome/browser/web_applications/web_app.h"
37 #include "chrome/common/chrome_paths.h" 37 #include "chrome/common/chrome_paths.h"
38 #include "chrome/common/extensions/extension_constants.h" 38 #include "chrome/common/extensions/extension_constants.h"
39 #include "chrome/common/extensions/manifest_url_handler.h" 39 #include "chrome/common/extensions/manifest_url_handler.h"
40 #include "chrome/grit/chromium_strings.h"
41 #include "chrome/grit/generated_resources.h" 40 #include "chrome/grit/generated_resources.h"
42 #include "content/public/browser/browser_thread.h" 41 #include "content/public/browser/browser_thread.h"
43 #include "content/public/browser/notification_service.h" 42 #include "content/public/browser/notification_service.h"
44 #include "content/public/browser/resource_dispatcher_host.h" 43 #include "content/public/browser/resource_dispatcher_host.h"
45 #include "content/public/browser/user_metrics.h" 44 #include "content/public/browser/user_metrics.h"
46 #include "extensions/browser/extension_prefs.h" 45 #include "extensions/browser/extension_prefs.h"
47 #include "extensions/browser/extension_system.h" 46 #include "extensions/browser/extension_system.h"
48 #include "extensions/browser/install_flag.h" 47 #include "extensions/browser/install_flag.h"
49 #include "extensions/browser/notification_types.h" 48 #include "extensions/browser/notification_types.h"
50 #include "extensions/common/extension_icon_set.h" 49 #include "extensions/common/extension_icon_set.h"
51 #include "extensions/common/feature_switch.h" 50 #include "extensions/common/feature_switch.h"
52 #include "extensions/common/file_util.h" 51 #include "extensions/common/file_util.h"
53 #include "extensions/common/manifest.h" 52 #include "extensions/common/manifest.h"
54 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" 53 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
55 #include "extensions/common/manifest_handlers/shared_module_info.h" 54 #include "extensions/common/manifest_handlers/shared_module_info.h"
56 #include "extensions/common/permissions/permission_message_provider.h" 55 #include "extensions/common/permissions/permission_message_provider.h"
57 #include "extensions/common/permissions/permission_set.h" 56 #include "extensions/common/permissions/permission_set.h"
58 #include "extensions/common/permissions/permissions_data.h" 57 #include "extensions/common/permissions/permissions_data.h"
59 #include "extensions/common/user_script.h" 58 #include "extensions/common/user_script.h"
60 #include "grit/extensions_strings.h" 59 #include "grit/extensions_strings.h"
61 #include "grit/theme_resources.h"
62 #include "third_party/skia/include/core/SkBitmap.h" 60 #include "third_party/skia/include/core/SkBitmap.h"
63 #include "ui/base/l10n/l10n_util.h" 61 #include "ui/base/l10n/l10n_util.h"
64 62
65 #if defined(OS_CHROMEOS) 63 #if defined(OS_CHROMEOS)
66 #include "components/user_manager/user_manager.h" 64 #include "components/user_manager/user_manager.h"
67 #endif 65 #endif
68 66
69 using base::UserMetricsAction; 67 using base::UserMetricsAction;
70 using content::BrowserThread; 68 using content::BrowserThread;
71 using extensions::SharedModuleInfo; 69 using extensions::SharedModuleInfo;
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) 890 if (!prefs->DidExtensionEscalatePermissions(extension()->id()))
893 return; 891 return;
894 892
895 if (client_) { 893 if (client_) {
896 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). 894 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort().
897 client_->ConfirmReEnable(this, extension()); 895 client_->ConfirmReEnable(this, extension());
898 } 896 }
899 } 897 }
900 898
901 } // namespace extensions 899 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698