Removal of Profile from content part 6.

chrome/browser/ui/webui/options/personal_options_handler.cc

 // Copyright (c) 2011 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/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 10 matching lines @@
   multiprofile_ = ProfileManager::IsMultipleProfilesEnabled();
 #if defined(OS_CHROMEOS)
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                  NotificationService::AllSources());
 #endif
 }
 
 PersonalOptionsHandler::~PersonalOptionsHandler() {
   ProfileSyncService* sync_service =
-      web_ui_->GetProfile()->GetProfileSyncService();
+      Profile::FromWebUI(web_ui_)->GetProfileSyncService();
   if (sync_service)
     sync_service->RemoveObserver(this);
 }
 
 void PersonalOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   RegisterTitle(localized_strings, "personalPage",
                 IDS_OPTIONS_CONTENT_TAB_LABEL);
@@ skipping 151 matching lines @@
     LoadAccountPicture(NULL);
 #endif
   } else {
     OptionsPageUIHandler::Observe(type, source, details);
   }
 }
 
 void PersonalOptionsHandler::OnStateChanged() {
   string16 status_label;
   string16 link_label;
-  ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService();
+  ProfileSyncService* service =
+      Profile::FromWebUI(web_ui_)->GetProfileSyncService();
   DCHECK(service);
   bool managed = service->IsManaged();
   bool sync_setup_completed = service->HasSyncSetupCompleted();
   bool status_has_error = sync_ui_util::GetStatusLabels(
       service, &status_label, &link_label) == sync_ui_util::SYNC_ERROR;
   browser_sync::SyncBackendHost::StatusSummary summary =
       service->QuerySyncStatusSummary();
 
   // TODO(jhawkins): This is terribly hacky. Sync should pass us this state, but
   // we have to fix the other callers of
@@ skipping 80 matching lines @@
 void PersonalOptionsHandler::OnLoginSuccess() {
   OnStateChanged();
 }
 
 void PersonalOptionsHandler::OnLoginFailure(
     const GoogleServiceAuthError& error) {
   OnStateChanged();
 }
 
 void PersonalOptionsHandler::ObserveThemeChanged() {
-  Profile* profile = web_ui_->GetProfile();
+  Profile* profile = Profile::FromWebUI(web_ui_);
 #if defined(TOOLKIT_GTK)
   GtkThemeService* theme_service = GtkThemeService::GetFrom(profile);
   bool is_gtk_theme = theme_service->UsingNativeTheme();
   FundamentalValue gtk_enabled(!is_gtk_theme);
   web_ui_->CallJavascriptFunction(
       "options.PersonalOptions.setGtkThemeButtonEnabled", gtk_enabled);
 #else
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
   bool is_gtk_theme = false;
 #endif
 
   bool is_classic_theme = !is_gtk_theme && theme_service->UsingDefaultTheme();
   FundamentalValue enabled(!is_classic_theme);
   web_ui_->CallJavascriptFunction(
       "options.PersonalOptions.setThemesResetButtonEnabled", enabled);
 }
 
 void PersonalOptionsHandler::Initialize() {
+  Profile* profile = Profile::FromWebUI(web_ui_);
+
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(ThemeServiceFactory::GetForProfile(
-                     web_ui_->GetProfile())));
+                     profile)));
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
                  NotificationService::AllSources());
   ObserveThemeChanged();
 
-  ProfileSyncService* sync_service =
-      web_ui_->GetProfile()->GetProfileSyncService();
+  ProfileSyncService* sync_service = profile->GetProfileSyncService();
   if (sync_service) {
     sync_service->AddObserver(this);
     OnStateChanged();
   } else {
     web_ui_->CallJavascriptFunction("options.PersonalOptions.hideSyncSection");
   }
 }
 
 void PersonalOptionsHandler::ThemesReset(const ListValue* args) {
   UserMetrics::RecordAction(UserMetricsAction("Options_ThemesReset"));
-  ThemeServiceFactory::GetForProfile(web_ui_->GetProfile())->UseDefaultTheme();
+  Profile* profile = Profile::FromWebUI(web_ui_);
+  ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
 }
 
 #if defined(TOOLKIT_GTK)
 void PersonalOptionsHandler::ThemesSetGTK(const ListValue* args) {
   UserMetrics::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
-  ThemeServiceFactory::GetForProfile(web_ui_->GetProfile())->SetNativeTheme();
+  Profile* profile = Profile::FromWebUI(web_ui_);
+  ThemeServiceFactory::GetForProfile(profile)->SetNativeTheme();
 }
 #endif
 
 #if defined(OS_CHROMEOS)
 void PersonalOptionsHandler::LoadAccountPicture(const ListValue* args) {
   const chromeos::UserManager::User& user =
       chromeos::UserManager::Get()->logged_in_user();
   std::string email = user.email();
   if (!email.empty()) {
     // int64 is either long or long long, but we need a certain format
@@ skipping 11 matching lines @@
     web_ui_->CallJavascriptFunction("AccountsOptions.updateAccountPicture",
                                     email_value, image_url);
   }
 }
 #endif
 
 void PersonalOptionsHandler::SendProfilesInfo() {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   ListValue profile_info_list;
-  FilePath current_profile_path = web_ui_->GetProfile()->GetPath();
+  FilePath current_profile_path =
+      web_ui_->tab_contents()->browser_context()->GetPath();
   for (size_t i = 0, e = cache.GetNumberOfProfiles(); i < e; ++i) {
     DictionaryValue *profile_value = new DictionaryValue();
     size_t icon_index = cache.GetAvatarIconIndexOfProfileAtIndex(i);
     FilePath profile_path = cache.GetPathOfProfileAtIndex(i);
     profile_value->SetString("name", cache.GetNameOfProfileAtIndex(i));
     profile_value->SetString("iconURL",
                              cache.GetDefaultAvatarIconUrl(icon_index));
     profile_value->Set("filePath",
                        base::CreateFilePathValue(
                           profile_path));
     profile_value->SetBoolean("isCurrentProfile",
                               profile_path == current_profile_path);
     profile_info_list.Append(profile_value);
   }
 
   web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo",
                                   profile_info_list);
 }
 
 void PersonalOptionsHandler::CreateProfile(const ListValue* args) {
   ProfileManager::CreateMultiProfileAsync();
 }