Settings->Advanced->Content settings are now applied correctly in Guest Mode

chrome/browser/ui/webui/options2/content_settings_handler2.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/ui/webui/options2/content_settings_handler2.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 22 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_switches.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/user_manager.h"
+#endif
+
 using content::UserMetricsAction;
 
 namespace {
 
 struct ContentSettingsTypeNameEntry {
   ContentSettingsType type;
   const char* name;
 };
 
 typedef std::map<ContentSettingsPattern, ContentSetting> OnePatternSettings;
@@ skipping 648 matching lines @@
   std::string group, setting;
   if (!(args->GetString(0, &group) &&
         args->GetString(1, &setting))) {
     NOTREACHED();
     return;
   }
 
   ContentSetting default_setting = ContentSettingFromString(setting);
   ContentSettingsType content_type = ContentSettingsTypeFromGroupName(group);
   Profile* profile = Profile::FromWebUI(web_ui());
+
+#if defined(OS_CHROMEOS)
+  // ChromeOS special case : in Guest mode settings are opened in Incognito
+  // mode, so we need original profile to actually modify settings.
+  if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) {

[James Hawkins, 2012/02/29 15:15:09]

Optional nit: no braces for single-line blocks.

[Denis Kuznetsov (DE-MUC), 2012/02/29 15:55:43]

Done.

+    profile = profile->GetOriginalProfile();
+  }
+#endif
+
   if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
     DesktopNotificationServiceFactory::GetForProfile(profile)->
         SetDefaultContentSetting(default_setting);
   } else {
-    HostContentSettingsMap* map = GetContentSettingsMap();
+    HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
     map->SetDefaultContentSetting(content_type, default_setting);
     ApplyWhitelist(content_type, default_setting);
   }
   switch (content_type) {
     case CONTENT_SETTINGS_TYPE_COOKIES:
       content::RecordAction(
           UserMetricsAction("Options_DefaultCookieSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_IMAGES:
       content::RecordAction(
@@ skipping 171 matching lines @@
 
 HostContentSettingsMap*
     ContentSettingsHandler::GetOTRContentSettingsMap() {
   Profile* profile = Profile::FromWebUI(web_ui());
   if (profile->HasOffTheRecordProfile())
     return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
   return NULL;
 }
 
 }  // namespace options2