diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 19:49:11 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 19:49:11 +0000 |
| commit | c82da8c4adce2fcf0fef48442f877f4d5917a6b1 (patch) | |
| tree | ea7a3f0956d3f0fc51f559ef5259cb29a9a03edb /chrome/browser/extensions/extension_navigation_observer.cc | |
| parent | 6420f2bf0febcfa31ba1d672d39d2ccfc1bd5f34 (diff) | |
| download | chromium_src-c82da8c4adce2fcf0fef48442f877f4d5917a6b1.zip chromium_src-c82da8c4adce2fcf0fef48442f877f4d5917a6b1.tar.gz chromium_src-c82da8c4adce2fcf0fef48442f877f4d5917a6b1.tar.bz2 | |
Refactoring ExtensionInstallUI to abstract the Browser references.
As part of the effort to build unit-tests on Android, this CL abstracts out
references to the Browser object from the extension install ui code.
For this, ExtensionInstallUI has been renamed ExtensionInstallPrompt and the
UI specific bits have been moved to a new class that took the old name
ExtensionInstallUI.
BUG=None
TEST=You should be able to install an extension.
All browser tests/unit tests should pass.
Review URL: https://chromiumcodereview.appspot.com/10388252
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_navigation_observer.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_navigation_observer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_navigation_observer.cc b/chrome/browser/extensions/extension_navigation_observer.cc index 2cb1bc6..d54eb45 100644 --- a/chrome/browser/extensions/extension_navigation_observer.cc +++ b/chrome/browser/extensions/extension_navigation_observer.cc @@ -73,8 +73,8 @@ void ExtensionNavigationObserver::PromptToEnableExtensionIfNecessary( in_progress_prompt_extension_id_ = extension->id(); in_progress_prompt_navigation_controller_ = nav_controller; - extension_install_ui_.reset(new ExtensionInstallUI(profile_)); - extension_install_ui_->ConfirmReEnable(this, extension); + extension_install_prompt_.reset(new ExtensionInstallPrompt(profile_)); + extension_install_prompt_->ConfirmReEnable(this, extension); } } @@ -89,7 +89,7 @@ void ExtensionNavigationObserver::InstallUIProceed() { in_progress_prompt_extension_id_ = ""; in_progress_prompt_navigation_controller_ = NULL; - extension_install_ui_.reset(); + extension_install_prompt_.reset(); // Grant permissions, re-enable the extension, and then reload the tab. extension_service->GrantPermissionsAndEnableExtension(extension); @@ -103,7 +103,7 @@ void ExtensionNavigationObserver::InstallUIAbort(bool user_initiated) { in_progress_prompt_extension_id_ = ""; in_progress_prompt_navigation_controller_ = NULL; - extension_install_ui_.reset(); + extension_install_prompt_.reset(); std::string histogram_name = user_initiated ? "Extensions.Permissions_ReEnableCancel" : |