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

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

Issue 11280287: Magnifier: Prevent useless operation in enabling/disabling magnifier. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years 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 fcbddc3ea35630369ac1ec2f63475185ffae85b2..5ae386bbf828831139b6f0941433b47d9bac4d97 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -527,8 +527,7 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
power_state_override_ = new PowerStateOverride(
PowerStateOverride::BLOCK_DISPLAY_SLEEP);
}
- magnification_manager_.reset(
- chromeos::MagnificationManager::CreateInstance());
+ chromeos::MagnificationManager::GetInstance()->Initialize();
chromeos::accessibility::Initialize();
primary_display_switch_observer_.reset(
@@ -627,7 +626,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
resume_observer_.reset();
brightness_observer_.reset();
output_observer_.reset();
stevenjb 2012/12/04 01:35:34 Having a MagnificationManager instance live past h
yoshiki 2012/12/04 08:30:20 I see, I added back removal of the instance. On 2
- magnification_manager_.reset();
power_state_override_ = NULL;
// The XInput2 event listener needs to be shut down earlier than when

Powered by Google App Engine
This is Rietveld 408576698