| 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/extension_navigation_observer.h" | 5 #include "chrome/browser/extensions/extension_navigation_observer.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 | 70 |
| 71 ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); | 71 ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); |
| 72 if (extension_prefs->DidExtensionEscalatePermissions(extension->id())) { | 72 if (extension_prefs->DidExtensionEscalatePermissions(extension->id())) { |
| 73 // Keep track of the extension id and nav controller we're prompting for. | 73 // Keep track of the extension id and nav controller we're prompting for. |
| 74 // These must be reset in InstallUIProceed and InstallUIAbort. | 74 // These must be reset in InstallUIProceed and InstallUIAbort. |
| 75 in_progress_prompt_extension_id_ = extension->id(); | 75 in_progress_prompt_extension_id_ = extension->id(); |
| 76 in_progress_prompt_navigation_controller_ = nav_controller; | 76 in_progress_prompt_navigation_controller_ = nav_controller; |
| 77 | 77 |
| 78 Browser* browser = browser::FindBrowserWithWebContents( | 78 Browser* browser = browser::FindBrowserWithWebContents( |
| 79 nav_controller->GetWebContents()); | 79 nav_controller->GetWebContents()); |
| 80 extension_install_prompt_.reset(new ExtensionInstallPrompt(browser)); | 80 extension_install_prompt_.reset( |
| 81 chrome::CreateExtensionInstallPromptWithBrowser(browser)); |
| 81 extension_install_prompt_->ConfirmReEnable(this, extension); | 82 extension_install_prompt_->ConfirmReEnable(this, extension); |
| 82 } | 83 } |
| 83 } | 84 } |
| 84 | 85 |
| 85 void ExtensionNavigationObserver::InstallUIProceed() { | 86 void ExtensionNavigationObserver::InstallUIProceed() { |
| 86 ExtensionService* extension_service = profile_->GetExtensionService(); | 87 ExtensionService* extension_service = profile_->GetExtensionService(); |
| 87 const extensions::Extension* extension = extension_service->GetExtensionById( | 88 const extensions::Extension* extension = extension_service->GetExtensionById( |
| 88 in_progress_prompt_extension_id_, true); | 89 in_progress_prompt_extension_id_, true); |
| 89 NavigationController* nav_controller = | 90 NavigationController* nav_controller = |
| 90 in_progress_prompt_navigation_controller_; | 91 in_progress_prompt_navigation_controller_; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 109 in_progress_prompt_extension_id_ = ""; | 110 in_progress_prompt_extension_id_ = ""; |
| 110 in_progress_prompt_navigation_controller_ = NULL; | 111 in_progress_prompt_navigation_controller_ = NULL; |
| 111 extension_install_prompt_.reset(); | 112 extension_install_prompt_.reset(); |
| 112 | 113 |
| 113 std::string histogram_name = user_initiated ? | 114 std::string histogram_name = user_initiated ? |
| 114 "Extensions.Permissions_ReEnableCancel" : | 115 "Extensions.Permissions_ReEnableCancel" : |
| 115 "Extensions.Permissions_ReEnableAbort"; | 116 "Extensions.Permissions_ReEnableAbort"; |
| 116 ExtensionService::RecordPermissionMessagesHistogram( | 117 ExtensionService::RecordPermissionMessagesHistogram( |
| 117 extension, histogram_name.c_str()); | 118 extension, histogram_name.c_str()); |
| 118 } | 119 } |
| OLD | NEW |