Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5604)

Unified Diff: chrome/browser/extensions/extension_install_ui_browsertest.cc

Issue 12210102: Ensure that the AppListController class which lives in app_list_controller_win.cc plays nice with A… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/app_launcher.cc ('k') | chrome/browser/ui/ash/app_list/app_list_controller_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_install_ui_browsertest.cc
===================================================================
--- chrome/browser/extensions/extension_install_ui_browsertest.cc (revision 181966)
+++ chrome/browser/extensions/extension_install_ui_browsertest.cc (working copy)
@@ -121,17 +121,8 @@
InstallThemeAndVerify("theme", "camo theme");
}
-// Disabled: http://crbug.com/174399
-#if defined(OS_WIN) && defined(USE_AURA)
-#define MAYBE_AppInstallConfirmation DISABLED_AppInstallConfirmation
-#define MAYBE_AppInstallConfirmation_Incognito DISABLED_AppInstallConfirmation_Incognito
-#else
-#define MAYBE_AppInstallConfirmation AppInstallConfirmation
-#define MAYBE_AppInstallConfirmation_Incognito AppInstallConfirmation_Incognito
-#endif
-
IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
- MAYBE_AppInstallConfirmation) {
+ AppInstallConfirmation) {
int num_tabs = browser()->tab_strip_model()->count();
base::FilePath app_dir = test_data_dir_.AppendASCII("app");
@@ -150,7 +141,7 @@
}
IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
- MAYBE_AppInstallConfirmation_Incognito) {
+ AppInstallConfirmation_Incognito) {
Browser* incognito_browser = CreateIncognitoBrowser();
int num_incognito_tabs = incognito_browser->tab_strip_model()->count();
« no previous file with comments | « apps/app_launcher.cc ('k') | chrome/browser/ui/ash/app_list/app_list_controller_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698