Magnifier: support guest mode

chrome/browser/chromeos/accessibility/magnification_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ skipping 18 matching lines @@
 static MagnificationManager* g_magnification_manager = NULL;
 }
 
 class MagnificationManagerImpl : public MagnificationManager,
                                  public content::NotificationObserver {
  public:
   MagnificationManagerImpl() : first_time_update_(true),
                                profile_(NULL),
                                type_(ash::MAGNIFIER_OFF) {
     registrar_.Add(this,
+                  chrome::NOTIFICATION_PROFILE_CREATED,
+                  content::NotificationService::AllSources());
+    registrar_.Add(this,
                   chrome::NOTIFICATION_SESSION_STARTED,
                   content::NotificationService::AllSources());
     registrar_.Add(this,
                   chrome::NOTIFICATION_PROFILE_DESTROYED,
                   content::NotificationService::AllSources());
     registrar_.Add(this,
                   chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE,
                   content::NotificationService::AllSources());
   }
 
@@ skipping 83 matching lines @@
   void UpdateMagnifierStatus() {
     ash::MagnifierType type = GetMagnifierTypeFromPref();
     SetMagnifier(type);
   }
 
   // content::NotificationObserver implimentation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     switch (type) {
+      // When entering the login screen or non-guest desktop.
       case chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE:
       case chrome::NOTIFICATION_SESSION_STARTED: {
         Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
-        SetProfile(profile);
+        if (!profile->IsGuestSession())
+          SetProfile(profile);
+        break;
+      }
+      // When entering guest desktop, no NOTIFICATION_SESSION_STARTED event is
+      // fired, so we use NOTIFICATION_PROFILE_CREATED event instead.
+      case chrome::NOTIFICATION_PROFILE_CREATED: {
+        Profile* profile = content::Source<Profile>(source).ptr();
+        if (profile->IsGuestSession())
+          SetProfile(profile);
         break;
       }
       case chrome::NOTIFICATION_PROFILE_DESTROYED: {
         SetProfile(NULL);
         break;
       }
     }
   }
 
   bool first_time_update_;
@@ skipping 17 matching lines @@
   delete g_magnification_manager;
   g_magnification_manager = NULL;
 }
 
 // static
 MagnificationManager* MagnificationManager::Get() {
   return g_magnification_manager;
 }
 
 }  // namespace chromeos