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

Side by Side Diff: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Issue 11740018: Cleanup: Remove more unneeded browser_thread.h includes. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix cros Created 7 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 #include "ash/magnifier/magnification_controller.h" 5 #include "ash/magnifier/magnification_controller.h"
6 #include "ash/shell.h" 6 #include "ash/shell.h"
7 #include "ash/system/tray/system_tray.h" 7 #include "ash/system/tray/system_tray.h"
8 #include "ash/system/tray/tray_views.h" 8 #include "ash/system/tray/tray_views.h"
9 #include "ash/system/tray_accessibility.h" 9 #include "ash/system/tray_accessibility.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 13 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
14 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 14 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
15 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 15 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
16 #include "chrome/browser/chromeos/login/helper.h" 16 #include "chrome/browser/chromeos/login/helper.h"
17 #include "chrome/browser/chromeos/login/login_utils.h" 17 #include "chrome/browser/chromeos/login/login_utils.h"
18 #include "chrome/browser/chromeos/login/user_manager.h" 18 #include "chrome/browser/chromeos/login/user_manager.h"
19 #include "chrome/browser/chromeos/login/user_manager_impl.h" 19 #include "chrome/browser/chromeos/login/user_manager_impl.h"
20 #include "chrome/browser/prefs/pref_service.h" 20 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/profiles/profile_manager.h" 22 #include "chrome/browser/profiles/profile_manager.h"
23 #include "chrome/common/chrome_notification_types.h" 23 #include "chrome/common/chrome_notification_types.h"
24 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "chrome/test/base/testing_profile.h" 26 #include "chrome/test/base/testing_profile.h"
27 #include "content/public/browser/browser_thread.h"
28 #include "content/public/test/test_utils.h" 27 #include "content/public/test/test_utils.h"
29 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
30 #include "ui/views/widget/widget.h" 29 #include "ui/views/widget/widget.h"
31 30
32 namespace chromeos { 31 namespace chromeos {
33 32
34 namespace { 33 namespace {
35 ui::MouseEvent& dummyEvent = *((ui::MouseEvent*)0); 34 ui::MouseEvent& dummyEvent = *((ui::MouseEvent*)0);
36 } 35 }
37 36
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE); 445 accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
447 accessibility::EnableHighContrast(false); 446 accessibility::EnableHighContrast(false);
448 MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF); 447 MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
449 EXPECT_TRUE(CreateDetailedMenu()); 448 EXPECT_TRUE(CreateDetailedMenu());
450 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); 449 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
451 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); 450 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
452 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); 451 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
453 CloseDetailMenu(); 452 CloseDetailMenu();
454 } 453 }
455 454
456 } 455 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698