diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-25 16:26:10 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-25 16:26:10 +0000 |
| commit | 17e0b44e09d940f8d6ee0f3011ded0f31996fd64 (patch) | |
| tree | eac88838771a863ba699e3a0badab631a7c325d9 /chrome/browser/extensions | |
| parent | 0a60a2e75bd9996320aed89143ee8df669832688 (diff) | |
| download | chromium_src-17e0b44e09d940f8d6ee0f3011ded0f31996fd64.zip chromium_src-17e0b44e09d940f8d6ee0f3011ded0f31996fd64.tar.gz chromium_src-17e0b44e09d940f8d6ee0f3011ded0f31996fd64.tar.bz2 | |
Fix crash in domui menu (7773) and remove caching code.
* Remove DOMView caching code.
* Remove change that is introduced by r62707, which is checked in by mistake.
* MenuUIHTMLSource can outlive MenuUI and cannot use it.
Define separate Delegate to inject menu specific data to JS.
* Remove debug code (NDEBUG)
BUG=chromium-os:7965, chromium-os:7773
TEST=OpenWithAppMenuOpen does not crash. ExtensionApiTest will not fail.
Review URL: http://codereview.chromium.org/3979009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_apitest.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index 18fe7ba..0547554 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -13,10 +13,6 @@ #include "chrome/common/notification_registrar.h" #include "chrome/test/ui_test_utils.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/views/domui_menu_widget.h" -#endif - namespace { const char kTestServerPort[] = "testServer.port"; @@ -122,13 +118,6 @@ bool ExtensionApiTest::RunPageTest(const std::string& page_url) { bool ExtensionApiTest::RunExtensionTestImpl(const char* extension_name, const std::string& page_url, bool enable_incognito) { -#if defined(OS_CHROMEOS) - // ChromeOS uses DOMUI for menu and creates a stand-by renderer to - // improve 1st time response. This can confuse this test as the test - // uses AllSources to listen to notifications, thus disabling the warmup - // process for ExtensionAPITests. - chromeos::DOMUIMenuWidget::DisableWarmUp(); -#endif ResultCatcher catcher; DCHECK(!std::string(extension_name).empty() || !page_url.empty()) << "extension_name and page_url cannot both be empty"; |