chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/accessibility/magnification_manager.cc ('k') | chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "base/command_line.h"	7 #include "base/command_line.h"

	8 #include "base/prefs/pref_service.h"

8 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

9 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"	10 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"

10 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"	11 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"

11 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"	12 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"

12 #include "chrome/browser/chromeos/login/helper.h"	13 #include "chrome/browser/chromeos/login/helper.h"

13 #include "chrome/browser/chromeos/login/login_utils.h"	14 #include "chrome/browser/chromeos/login/login_utils.h"

14 #include "chrome/browser/chromeos/login/user_manager.h"	15 #include "chrome/browser/chromeos/login/user_manager.h"

15 #include "chrome/browser/chromeos/login/user_manager_impl.h"	16 #include "chrome/browser/chromeos/login/user_manager_impl.h"

16 #include "chrome/browser/prefs/pref_service.h"

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/profiles/profile_manager.h"	18 #include "chrome/browser/profiles/profile_manager.h"

19 #include "chrome/common/chrome_notification_types.h"	19 #include "chrome/common/chrome_notification_types.h"

20 #include "chrome/common/chrome_switches.h"	20 #include "chrome/common/chrome_switches.h"

21 #include "chrome/common/pref_names.h"	21 #include "chrome/common/pref_names.h"

22 #include "chrome/test/base/testing_profile.h"	22 #include "chrome/test/base/testing_profile.h"

23 #include "testing/gtest/include/gtest/gtest.h"	23 #include "testing/gtest/include/gtest/gtest.h"

24	24

25 namespace chromeos {	25 namespace chromeos {

26	26

(...skipping 462 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
489	489

490 // Disables magnifier again and confirms observer is invoked.	490 // Disables magnifier again and confirms observer is invoked.

491 observed_ = false;	491 observed_ = false;

492 SetMagnifierEnabled(false);	492 SetMagnifierEnabled(false);

493 EXPECT_TRUE(observed_);	493 EXPECT_TRUE(observed_);

494 EXPECT_FALSE(observed_enabled_);	494 EXPECT_FALSE(observed_enabled_);

495 EXPECT_FALSE(IsMagnifierEnabled());	495 EXPECT_FALSE(IsMagnifierEnabled());

496 }	496 }

497	497

498 } // namespace chromeos	498 } // namespace chromeos

OLD	NEW