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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 11065008: Full Screen Magnifier: Add MagnificationManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo. Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 28664f9dcc4454d835eec2cb46cd884ab86eb6ef..178961de48379f807bc39c02d19c8bb6093e1fa8 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -17,6 +17,7 @@
#include "base/string_number_conversions.h"
#include "base/string_split.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
#include "chrome/browser/chromeos/audio/audio_handler.h"
#include "chrome/browser/chromeos/boot_times_loader.h"
#include "chrome/browser/chromeos/contacts/contact_manager.h"
@@ -463,6 +464,8 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
power_state_override_.reset(new chromeos::PowerStateOverride(
chromeos::PowerStateOverride::BLOCK_DISPLAY_SLEEP));
}
+ magnification_manager_.reset(
+ chromeos::MagnificationManager::CreateInstance());
primary_display_switch_observer_.reset(
new chromeos::PrimaryDisplaySwitchObserver());
@@ -546,6 +549,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
media_transfer_protocol_device_observer_.reset();
output_observer_.reset();
power_state_override_.reset();
+ magnification_manager_.reset();
// The XInput2 event listener needs to be shut down earlier than when
// Singletons are finally destroyed in AtExitManager.

Powered by Google App Engine
This is Rietveld 408576698