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

Side by Side Diff: chrome/browser/ui/views/keyboard_access_browsertest.cc

Issue 137993009: Remove more non-aura windows code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: renable the disabled tests Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This functionality currently works on Windows and on Linux when 5 // This functionality currently works on Windows and on Linux when
6 // toolkit_views is defined (i.e. for Chrome OS). It's not needed 6 // toolkit_views is defined (i.e. for Chrome OS). It's not needed
7 // on the Mac, and it's not yet implemented on Linux. 7 // on the Mac, and it's not yet implemented on Linux.
8 8
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 #if defined(OS_WIN) 356 #if defined(OS_WIN)
357 #define MAYBE_TestShiftAltMenuKeyboardAccess DISABLED_TestShiftAltMenuKeyboardAc cess 357 #define MAYBE_TestShiftAltMenuKeyboardAccess DISABLED_TestShiftAltMenuKeyboardAc cess
358 #else 358 #else
359 #define MAYBE_TestShiftAltMenuKeyboardAccess TestShiftAltMenuKeyboardAccess 359 #define MAYBE_TestShiftAltMenuKeyboardAccess TestShiftAltMenuKeyboardAccess
360 #endif 360 #endif
361 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, 361 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest,
362 MAYBE_TestShiftAltMenuKeyboardAccess) { 362 MAYBE_TestShiftAltMenuKeyboardAccess) {
363 TestMenuKeyboardAccess(true, true, false); 363 TestMenuKeyboardAccess(true, true, false);
364 } 364 }
365 365
366 #if defined(OS_WIN) && !defined(USE_AURA) 366 #if defined(OS_WIN)
367 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, 367 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestAltMenuKeyboardAccessFocusOmnibox ) {
368 TestAltMenuKeyboardAccessFocusOmnibox) {
369 TestMenuKeyboardAccess(true, false, true); 368 TestMenuKeyboardAccess(true, false, true);
370 } 369 }
371 370
372 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestSystemMenuWithKeyboard) { 371 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestSystemMenuWithKeyboard) {
373 TestSystemMenuWithKeyboard(); 372 TestSystemMenuWithKeyboard();
374 } 373 }
375 #endif 374 #endif
376 375
377 #if !defined(OS_WIN) && defined(USE_AURA) 376 #if !defined(OS_WIN) && defined(USE_AURA)
378 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) { 377 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 browser(), ui::VKEY_BROWSER_FORWARD, false, false, false, false)); 434 browser(), ui::VKEY_BROWSER_FORWARD, false, false, false, false));
436 435
437 base::string16 after_forward; 436 base::string16 after_forward;
438 ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), &after_forward)); 437 ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), &after_forward));
439 438
440 EXPECT_EQ(before_back, after_forward); 439 EXPECT_EQ(before_back, after_forward);
441 } 440 }
442 #endif 441 #endif
443 442
444 } // namespace 443 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/hung_renderer_view.cc ('k') | chrome/browser/ui/views/panels/panel_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698