chrome/browser/chromeos/accessibility/magnification_manager.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_util.cc ('k') | chrome/browser/chromeos/accessibility/magnification_manager_browsertest.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 "chrome/browser/chromeos/accessibility/magnification_manager.h"	5 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"

6	6

7 #include <limits>	7 #include <limits>

8	8

9 #include "ash/magnifier/magnification_controller.h"	9 #include "ash/magnifier/magnification_controller.h"

10 #include "ash/magnifier/partial_magnification_controller.h"	10 #include "ash/magnifier/partial_magnification_controller.h"

11 #include "ash/session/session_state_delegate.h"	11 #include "ash/session/session_state_delegate.h"

12 #include "ash/shell.h"	12 #include "ash/shell.h"

13 #include "ash/shell_delegate.h"	13 #include "ash/shell_delegate.h"

14 #include "ash/system/tray/system_tray_notifier.h"	14 #include "ash/system/tray/system_tray_notifier.h"

15 #include "base/macros.h"	15 #include "base/macros.h"

16 #include "base/memory/scoped_ptr.h"	16 #include "base/memory/scoped_ptr.h"

17 #include "base/memory/singleton.h"	17 #include "base/memory/singleton.h"

18 #include "base/prefs/pref_member.h"

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

20 #include "chrome/browser/chrome_notification_types.h"	18 #include "chrome/browser/chrome_notification_types.h"

21 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

22 #include "chrome/browser/chromeos/profiles/profile_helper.h"	20 #include "chrome/browser/chromeos/profiles/profile_helper.h"

23 #include "chrome/browser/profiles/profile.h"	21 #include "chrome/browser/profiles/profile.h"

24 #include "chrome/browser/profiles/profile_manager.h"	22 #include "chrome/browser/profiles/profile_manager.h"

25 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

	24 #include "components/prefs/pref_member.h"

	25 #include "components/prefs/pref_service.h"

26 #include "content/public/browser/focused_node_details.h"	26 #include "content/public/browser/focused_node_details.h"

27 #include "content/public/browser/notification_details.h"	27 #include "content/public/browser/notification_details.h"

28 #include "content/public/browser/notification_observer.h"	28 #include "content/public/browser/notification_observer.h"

29 #include "content/public/browser/notification_registrar.h"	29 #include "content/public/browser/notification_registrar.h"

30 #include "content/public/browser/notification_service.h"	30 #include "content/public/browser/notification_service.h"

31 #include "content/public/browser/notification_source.h"	31 #include "content/public/browser/notification_source.h"

32	32

33 class AccountId;	33 class AccountId;

34	34

35 namespace chromeos {	35 namespace chromeos {

(...skipping 278 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
314 delete g_magnification_manager;	314 delete g_magnification_manager;

315 g_magnification_manager = NULL;	315 g_magnification_manager = NULL;

316 }	316 }

317	317

318 // static	318 // static

319 MagnificationManager* MagnificationManager::Get() {	319 MagnificationManager* MagnificationManager::Get() {

320 return g_magnification_manager;	320 return g_magnification_manager;

321 }	321 }

322	322

323 } // namespace chromeos	323 } // namespace chromeos

OLD	NEW