diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 06:35:30 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 06:35:30 +0000 |
| commit | 294064b632d5c4b79c33cabb1387502fd93edc6d (patch) | |
| tree | 4439b570d89d23df6635cd5c432922b2354d347c /chrome/browser/extensions | |
| parent | 04939794970b9fd368a0043a830892773064b45c (diff) | |
| download | chromium_src-294064b632d5c4b79c33cabb1387502fd93edc6d.zip chromium_src-294064b632d5c4b79c33cabb1387502fd93edc6d.tar.gz chromium_src-294064b632d5c4b79c33cabb1387502fd93edc6d.tar.bz2 | |
Revert 161812 - Links in platform apps should open in the system default browser.
BUG=145646
TEST=manually
Review URL: https://chromiumcodereview.appspot.com/10915047
TBR=junmin.zhu@intel.com
Review URL: https://codereview.chromium.org/11145015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/platform_app_browsertest_util.cc | 44 | ||||
| -rw-r--r-- | chrome/browser/extensions/platform_app_browsertest_util.h | 19 |
2 files changed, 0 insertions, 63 deletions
diff --git a/chrome/browser/extensions/platform_app_browsertest_util.cc b/chrome/browser/extensions/platform_app_browsertest_util.cc index 7b2af25..3d1fe7c 100644 --- a/chrome/browser/extensions/platform_app_browsertest_util.cc +++ b/chrome/browser/extensions/platform_app_browsertest_util.cc @@ -10,8 +10,6 @@ #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/shell_window_registry.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/common/chrome_switches.h" @@ -24,42 +22,6 @@ namespace utils = extension_function_test_utils; namespace extensions { -MockExternalUrlController::MockExternalUrlController() { -} - -MockExternalUrlController::~MockExternalUrlController() { -} - -content::WebContents* MockExternalUrlController::OpenURLFromTab( - content::WebContents* source, - const content::OpenURLParams& params) { - // Delete useless web content first to - // avoid a potential leak in a render process host. - delete source; - - // Force to open in a new tab. - WindowOpenDisposition disposition = params.disposition; - content::OpenURLParams new_tab_params = params; - new_tab_params.disposition = - disposition == NEW_BACKGROUND_TAB ? disposition : NEW_FOREGROUND_TAB; - for (BrowserList::const_iterator i = BrowserList::begin(); - i != BrowserList::end(); ++i) { - if ((*i)->is_type_tabbed()) { - Browser* browser = *i; - content::WebContents* new_tab = browser->OpenURL(new_tab_params); - browser->window()->Show(); - return new_tab; - } - } - return NULL; -} - -PlatformAppBrowserTest::PlatformAppBrowserTest() { -} - -PlatformAppBrowserTest::~PlatformAppBrowserTest() { -} - void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); @@ -69,12 +31,6 @@ void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) { command_line->AppendSwitchASCII(switches::kEventPageUnloadingTime, "1"); } -void PlatformAppBrowserTest::SetUpOnMainThread() { - mock_external_url_controller_.reset(new MockExternalUrlController()); - ShellWindow::SetExternalUrlControllerForTesting( - mock_external_url_controller_.get()); -} - const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp( const char* name) { content::WindowedNotificationObserver app_loaded_observer( diff --git a/chrome/browser/extensions/platform_app_browsertest_util.h b/chrome/browser/extensions/platform_app_browsertest_util.h index 1416d1f..3d3a2a7 100644 --- a/chrome/browser/extensions/platform_app_browsertest_util.h +++ b/chrome/browser/extensions/platform_app_browsertest_util.h @@ -19,26 +19,9 @@ class ShellWindow; namespace extensions { class Extension; -class MockExternalUrlController : public content::WebContentsDelegate { - public: - MockExternalUrlController(); - virtual ~MockExternalUrlController(); - - private: - // content::WebContentsDelegate implementation. - virtual content::WebContents* OpenURLFromTab( - content::WebContents* source, - const content::OpenURLParams& params) OVERRIDE; - - DISALLOW_COPY_AND_ASSIGN(MockExternalUrlController); -}; - class PlatformAppBrowserTest : public ExtensionApiTest { public: - PlatformAppBrowserTest(); - virtual ~PlatformAppBrowserTest(); virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; protected: // Runs the app named |name| out of the platform_apps subdirectory. Waits @@ -83,8 +66,6 @@ class PlatformAppBrowserTest : public ExtensionApiTest { // Closes |window| and waits until it's gone. void CloseShellWindow(ShellWindow* window); - - scoped_ptr<MockExternalUrlController> mock_external_url_controller_; }; } |