diff options
author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 22:11:44 +0000 |
---|---|---|
committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 22:11:44 +0000 |
commit | 166ea521da0b6fec159d864171e15f1e74785845 (patch) | |
tree | d94043a50d77e100c01298e08cef0419c3071e9b /chrome/browser/ui/views/menu_model_adapter_test.cc | |
parent | 8dee09204160685d7409a0caf525aea59d87a0c6 (diff) | |
download | chromium_src-166ea521da0b6fec159d864171e15f1e74785845.zip chromium_src-166ea521da0b6fec159d864171e15f1e74785845.tar.gz chromium_src-166ea521da0b6fec159d864171e15f1e74785845.tar.bz2 |
Revert 135000 - Re-implement the screensaver to use WebView instead of ExtensionDialogHost.
Use WebView to render the screensaver extension instead of ExtensionDialogHost. Using the RenderViewGone override to detect termination of the renderer process to restart it.
Added browser tests.
R=ben@chromium.org,sky@chromium.org
BUG=chromium-os:28211
TEST=Tested that the screensaver comes up; tested the reload via crashing the extension renderer with SIG_ABRT; also ran browser tests.
Review URL: https://chromiumcodereview.appspot.com/10191010
TBR=rkc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10335010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/menu_model_adapter_test.cc')
-rw-r--r-- | chrome/browser/ui/views/menu_model_adapter_test.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index 98a6683..740ec42 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc @@ -95,12 +95,6 @@ class TestViewsDelegate : public views::ViewsDelegate { } #endif - content::WebContents* CreateWebContents( - content::BrowserContext* browser_context, - content::SiteInstance* site_instance) OVERRIDE { - return NULL; - } - private: DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); }; |