diff options
Diffstat (limited to 'chrome/browser')
4 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/ui/browser_list_win.cc b/chrome/browser/ui/browser_list_win.cc index 88a46b1..10554ad 100644 --- a/chrome/browser/ui/browser_list_win.cc +++ b/chrome/browser/ui/browser_list_win.cc @@ -8,5 +8,7 @@ // static void BrowserList::AllBrowsersClosedAndAppExiting() { +#if !defined(USE_AURA) views::Widget::CloseAllSecondaryWidgets(); +#endif } diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc index 6d9366c..e447f029 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc +++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc @@ -65,14 +65,14 @@ void TabModalConfirmDialogTest::CloseDialog(bool accept) { dialog_->OnAccept(NULL); else dialog_->OnCancel(NULL); -#elif defined(OS_CHROMEOS) || defined(USE_AURA) +#elif defined(OS_CHROMEOS) && !defined(USE_AURA) // |dialog_| deletes itself in |OnDialogClosed()|, so we need to save its // ConstrainedHTMLUIDelegate before that. ConstrainedHtmlUIDelegate* constrained_html_ui_delegate = dialog_->constrained_html_ui_delegate(); dialog_->OnDialogClosed(accept ? "true" : "false"); constrained_html_ui_delegate->OnDialogCloseFromWebUI(); -#elif defined(OS_WIN) +#else if (accept) dialog_->GetDialogClientView()->AcceptWindow(); else diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h index 7bce236..400d8d0 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h +++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h @@ -15,11 +15,11 @@ typedef TabModalConfirmDialogMac TabModalConfirmDialog; #elif defined(TOOLKIT_GTK) #include "chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.h" typedef TabModalConfirmDialogGtk TabModalConfirmDialog; -#elif defined(OS_CHROMEOS) || defined(USE_AURA) +#elif defined(OS_CHROMEOS) && !defined(USE_AURA) #include "chrome/browser/ui/webui/constrained_html_ui.h" #include "chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.h" typedef TabModalConfirmDialogWebUI TabModalConfirmDialog; -#elif defined(OS_WIN) +#else #include "chrome/browser/ui/views/tab_modal_confirm_dialog_views.h" typedef TabModalConfirmDialogViews TabModalConfirmDialog; #endif diff --git a/chrome/browser/ui/views/aura/caps_lock_handler_browsertest.cc b/chrome/browser/ui/views/aura/caps_lock_handler_browsertest.cc index 7e45167..a830d1b 100644 --- a/chrome/browser/ui/views/aura/caps_lock_handler_browsertest.cc +++ b/chrome/browser/ui/views/aura/caps_lock_handler_browsertest.cc @@ -88,9 +88,9 @@ class CapsLockHandlerTest : public InProcessBrowserTest { } // namespace +#if defined(OS_CHROMEOS) // Check if HandleToggleCapsLock() really changes the lock state. IN_PROC_BROWSER_TEST_F(CapsLockHandlerTest, TestCapsLock) { -#if defined(OS_CHROMEOS) EXPECT_EQ(initial_caps_lock_state_, handler_->caps_lock_is_on_for_test()); EXPECT_TRUE(handler_->HandleToggleCapsLock()); EXPECT_EQ(!initial_caps_lock_state_, xkeyboard_.CapsLockIsEnabled()); @@ -100,5 +100,5 @@ IN_PROC_BROWSER_TEST_F(CapsLockHandlerTest, TestCapsLock) { handler_->OnCapsLockChange(initial_caps_lock_state_); EXPECT_EQ(initial_caps_lock_state_, xkeyboard_.CapsLockIsEnabled()); EXPECT_EQ(initial_caps_lock_state_, handler_->caps_lock_is_on_for_test()); -#endif } +#endif |