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 #include "chrome/browser/extensions/navigation_observer.h" | 5 #include "chrome/browser/extensions/navigation_observer.h" |
6 | 6 |
7 #include "chrome/browser/extensions/extension_install_ui.h" | 7 #include "chrome/browser/extensions/extension_install_ui.h" |
8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "content/public/browser/navigation_controller.h" | 10 #include "content/public/browser/navigation_controller.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 void NavigationObserver::InstallUIAbort(bool user_initiated) { | 105 void NavigationObserver::InstallUIAbort(bool user_initiated) { |
106 ExtensionService* extension_service = | 106 ExtensionService* extension_service = |
107 extensions::ExtensionSystem::Get(profile_)->extension_service(); | 107 extensions::ExtensionSystem::Get(profile_)->extension_service(); |
108 const Extension* extension = extension_service->GetExtensionById( | 108 const Extension* extension = extension_service->GetExtensionById( |
109 in_progress_prompt_extension_id_, true); | 109 in_progress_prompt_extension_id_, true); |
110 | 110 |
111 in_progress_prompt_extension_id_ = ""; | 111 in_progress_prompt_extension_id_ = ""; |
112 in_progress_prompt_navigation_controller_ = NULL; | 112 in_progress_prompt_navigation_controller_ = NULL; |
113 extension_install_prompt_.reset(); | 113 extension_install_prompt_.reset(); |
114 | 114 |
115 std::string histogram_name = user_initiated ? | 115 std::string histogram_name = user_initiated |
116 "Extensions.Permissions_ReEnableCancel" : | 116 ? "Extensions.Permissions_ReEnableCancel2" |
117 "Extensions.Permissions_ReEnableAbort"; | 117 : "Extensions.Permissions_ReEnableAbort2"; |
118 ExtensionService::RecordPermissionMessagesHistogram( | 118 ExtensionService::RecordPermissionMessagesHistogram( |
119 extension, histogram_name.c_str()); | 119 extension, histogram_name.c_str()); |
120 } | 120 } |
121 | 121 |
122 } // namespace extensions | 122 } // namespace extensions |
OLD | NEW |