summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/options2/browser_options_handler2.cc
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 20:09:13 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 20:09:13 +0000
commit5e61afb935ec49bda9c3a1ef33fc11eaae242beb (patch)
tree8f6ce2ee74bffaaf7680fceb6b65fdf9c6c11f2f /chrome/browser/ui/webui/options2/browser_options_handler2.cc
parentb7df4e2be5517bc7914152609e957b77dbcfb26f (diff)
downloadchromium_src-5e61afb935ec49bda9c3a1ef33fc11eaae242beb.zip
chromium_src-5e61afb935ec49bda9c3a1ef33fc11eaae242beb.tar.gz
chromium_src-5e61afb935ec49bda9c3a1ef33fc11eaae242beb.tar.bz2
Remove a bunch of GetProfileSyncService callers to use the new factory.
This is mostly everything except code under /sync or sync_internals (those require a little more time as they have unit test implications). The ones here are quite simple but need several owner-approvals, and given the upcoming 18 branch I'd like to get this landed without a cross-team monday crunch :) TBR=jhawkins@chromium.org TBR=mirandac@chromium.org TBR=isherman@chromium.org TBR=nkostylev@chromium.org TBR=estade@chromium.org BUG=93922 Review URL: http://codereview.chromium.org/9169096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/options2/browser_options_handler2.cc')
-rw-r--r--chrome/browser/ui/webui/options2/browser_options_handler2.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
index 1720519..7f02994 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
@@ -35,6 +35,7 @@
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/sync/sync_setup_flow.h"
#include "chrome/browser/sync/sync_ui_util.h"
#include "chrome/browser/themes/theme_service.h"
@@ -95,8 +96,8 @@ BrowserOptionsHandler::BrowserOptionsHandler()
}
BrowserOptionsHandler::~BrowserOptionsHandler() {
- ProfileSyncService* sync_service =
- Profile::FromWebUI(web_ui())->GetProfileSyncService();
+ ProfileSyncService* sync_service(ProfileSyncServiceFactory::
+ GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));
if (sync_service)
sync_service->RemoveObserver(this);
@@ -280,8 +281,8 @@ void BrowserOptionsHandler::RegisterMessages() {
void BrowserOptionsHandler::OnStateChanged() {
string16 status_label;
string16 link_label;
- ProfileSyncService* service =
- Profile::FromWebUI(web_ui())->GetProfileSyncService();
+ ProfileSyncService* service(ProfileSyncServiceFactory::
+ GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));
DCHECK(service);
bool managed = service->IsManaged();
bool sync_setup_completed = service->HasSyncSetupCompleted();
@@ -371,7 +372,8 @@ void BrowserOptionsHandler::OnStateChanged() {
void BrowserOptionsHandler::Initialize() {
Profile* profile = Profile::FromWebUI(web_ui());
- ProfileSyncService* sync_service = profile->GetProfileSyncService();
+ ProfileSyncService* sync_service(ProfileSyncServiceFactory::
+ GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));
if (sync_service) {
sync_service->AddObserver(this);
OnStateChanged();