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

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

Issue 2771233002: Remove the wrapper functions content::RecordAction et al (Closed)
Patch Set: Rebased Created 3 years, 8 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 #include <utility> 9 #include <utility>
10 10
(...skipping 23 matching lines...) Expand all
34 #include "chrome/browser/extensions/permissions_updater.h" 34 #include "chrome/browser/extensions/permissions_updater.h"
35 #include "chrome/browser/extensions/webstore_installer.h" 35 #include "chrome/browser/extensions/webstore_installer.h"
36 #include "chrome/browser/profiles/profile.h" 36 #include "chrome/browser/profiles/profile.h"
37 #include "chrome/browser/web_applications/web_app.h" 37 #include "chrome/browser/web_applications/web_app.h"
38 #include "chrome/common/chrome_paths.h" 38 #include "chrome/common/chrome_paths.h"
39 #include "chrome/common/extensions/extension_constants.h" 39 #include "chrome/common/extensions/extension_constants.h"
40 #include "chrome/grit/generated_resources.h" 40 #include "chrome/grit/generated_resources.h"
41 #include "content/public/browser/browser_thread.h" 41 #include "content/public/browser/browser_thread.h"
42 #include "content/public/browser/notification_service.h" 42 #include "content/public/browser/notification_service.h"
43 #include "content/public/browser/resource_dispatcher_host.h" 43 #include "content/public/browser/resource_dispatcher_host.h"
44 #include "content/public/browser/user_metrics.h"
45 #include "extensions/browser/extension_prefs.h" 44 #include "extensions/browser/extension_prefs.h"
46 #include "extensions/browser/extension_registry.h" 45 #include "extensions/browser/extension_registry.h"
47 #include "extensions/browser/extension_system.h" 46 #include "extensions/browser/extension_system.h"
48 #include "extensions/browser/install/crx_install_error.h" 47 #include "extensions/browser/install/crx_install_error.h"
49 #include "extensions/browser/install/extension_install_ui.h" 48 #include "extensions/browser/install/extension_install_ui.h"
50 #include "extensions/browser/install_flag.h" 49 #include "extensions/browser/install_flag.h"
51 #include "extensions/browser/notification_types.h" 50 #include "extensions/browser/notification_types.h"
52 #include "extensions/browser/preload_check.h" 51 #include "extensions/browser/preload_check.h"
53 #include "extensions/common/extension_icon_set.h" 52 #include "extensions/common/extension_icon_set.h"
54 #include "extensions/common/file_util.h" 53 #include "extensions/common/file_util.h"
55 #include "extensions/common/manifest.h" 54 #include "extensions/common/manifest.h"
56 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" 55 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
57 #include "extensions/common/manifest_handlers/shared_module_info.h" 56 #include "extensions/common/manifest_handlers/shared_module_info.h"
58 #include "extensions/common/manifest_url_handlers.h" 57 #include "extensions/common/manifest_url_handlers.h"
59 #include "extensions/common/permissions/permission_message_provider.h" 58 #include "extensions/common/permissions/permission_message_provider.h"
60 #include "extensions/common/permissions/permission_set.h" 59 #include "extensions/common/permissions/permission_set.h"
61 #include "extensions/common/permissions/permissions_data.h" 60 #include "extensions/common/permissions/permissions_data.h"
62 #include "extensions/common/user_script.h" 61 #include "extensions/common/user_script.h"
63 #include "extensions/strings/grit/extensions_strings.h" 62 #include "extensions/strings/grit/extensions_strings.h"
64 #include "third_party/skia/include/core/SkBitmap.h" 63 #include "third_party/skia/include/core/SkBitmap.h"
65 #include "ui/base/l10n/l10n_util.h" 64 #include "ui/base/l10n/l10n_util.h"
66 65
67 #if defined(OS_CHROMEOS) 66 #if defined(OS_CHROMEOS)
68 #include "components/user_manager/user_manager.h" 67 #include "components/user_manager/user_manager.h"
69 #endif 68 #endif
70 69
71 using base::UserMetricsAction;
72 using content::BrowserThread; 70 using content::BrowserThread;
73 71
74 namespace extensions { 72 namespace extensions {
75 73
76 namespace { 74 namespace {
77 75
78 // Used in histograms; do not change order. 76 // Used in histograms; do not change order.
79 enum OffStoreInstallDecision { 77 enum OffStoreInstallDecision {
80 OnStoreInstall, 78 OnStoreInstall,
81 OffStoreInstallAllowed, 79 OffStoreInstallAllowed,
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 ExtensionInstallPrompt::GetReEnablePromptTypeForExtension( 907 ExtensionInstallPrompt::GetReEnablePromptTypeForExtension(
910 service->profile(), extension()); 908 service->profile(), extension());
911 client_->ShowDialog(base::Bind(&CrxInstaller::OnInstallPromptDone, this), 909 client_->ShowDialog(base::Bind(&CrxInstaller::OnInstallPromptDone, this),
912 extension(), nullptr, 910 extension(), nullptr,
913 base::MakeUnique<ExtensionInstallPrompt::Prompt>(type), 911 base::MakeUnique<ExtensionInstallPrompt::Prompt>(type),
914 ExtensionInstallPrompt::GetDefaultShowDialogCallback()); 912 ExtensionInstallPrompt::GetDefaultShowDialogCallback());
915 } 913 }
916 } 914 }
917 915
918 } // namespace extensions 916 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698