chrome/browser/chromeos/accessibility/magnification_manager.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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/magnification_manager.h ('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 #include <memory>	8 #include <memory>

9	9

10 #include "ash/accessibility_types.h"	10 #include "ash/common/accessibility_types.h"

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

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

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

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

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

16 #include "chrome/browser/chrome_notification_types.h"	16 #include "chrome/browser/chrome_notification_types.h"

17 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	17 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

18 #include "chrome/browser/chromeos/profiles/profile_helper.h"	18 #include "chrome/browser/chromeos/profiles/profile_helper.h"

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

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

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

312 g_magnification_manager = NULL;	312 g_magnification_manager = NULL;

313 }	313 }

314	314

315 // static	315 // static

316 MagnificationManager* MagnificationManager::Get() {	316 MagnificationManager* MagnificationManager::Get() {

317 return g_magnification_manager;	317 return g_magnification_manager;

318 }	318 }

319	319

320 } // namespace chromeos	320 } // namespace chromeos

OLD	NEW