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

Side by Side Diff: chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc

Issue 9169096: Remove a bunch of GetProfileSyncService callers to use the new factory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm todos Created 8 years, 11 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h" 5 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/string_split.h" 11 #include "base/string_split.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/net/chrome_url_request_context.h" 15 #include "chrome/browser/net/chrome_url_request_context.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/sync/profile_sync_service.h"
19 #include "chrome/browser/sync/profile_sync_service_factory.h"
18 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
19 #include "content/browser/renderer_host/render_view_host.h" 21 #include "content/browser/renderer_host/render_view_host.h"
20 #include "content/public/browser/web_ui.h" 22 #include "content/public/browser/web_ui.h"
21 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
22 #include "net/base/cookie_monster.h" 24 #include "net/base/cookie_monster.h"
23 #include "net/url_request/url_request_context.h" 25 #include "net/url_request/url_request_context.h"
24 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
25 27
26 // Default URL for the sync web interface. 28 // Default URL for the sync web interface.
27 // 29 //
(...skipping 21 matching lines...) Expand all
49 case sync_ui_util::SYNC_PROMO: 51 case sync_ui_util::SYNC_PROMO:
50 return SYNC_PROMO; 52 return SYNC_PROMO;
51 case sync_ui_util::PRE_SYNCED: 53 case sync_ui_util::PRE_SYNCED:
52 case sync_ui_util::SYNCED: 54 case sync_ui_util::SYNCED:
53 default: 55 default:
54 return HIDE; 56 return HIDE;
55 } 57 }
56 } 58 }
57 59
58 void NewTabPageSyncHandler::RegisterMessages() { 60 void NewTabPageSyncHandler::RegisterMessages() {
59 sync_service_ = Profile::FromWebUI(web_ui())->GetProfileSyncService(); 61 sync_service_ = ProfileSyncServiceFactory::GetInstance()->GetForProfile(
62 Profile::FromWebUI(web_ui()));
60 DCHECK(sync_service_); // This shouldn't get called by an incognito NTP. 63 DCHECK(sync_service_); // This shouldn't get called by an incognito NTP.
61 DCHECK(!sync_service_->IsManaged()); // And neither if sync is managed. 64 DCHECK(!sync_service_->IsManaged()); // And neither if sync is managed.
62 sync_service_->AddObserver(this); 65 sync_service_->AddObserver(this);
63 66
64 web_ui()->RegisterMessageCallback("GetSyncMessage", 67 web_ui()->RegisterMessageCallback("GetSyncMessage",
65 base::Bind(&NewTabPageSyncHandler::HandleGetSyncMessage, 68 base::Bind(&NewTabPageSyncHandler::HandleGetSyncMessage,
66 base::Unretained(this))); 69 base::Unretained(this)));
67 web_ui()->RegisterMessageCallback("SyncLinkClicked", 70 web_ui()->RegisterMessageCallback("SyncLinkClicked",
68 base::Bind(&NewTabPageSyncHandler::HandleSyncLinkClicked, 71 base::Bind(&NewTabPageSyncHandler::HandleSyncLinkClicked,
69 base::Unretained(this))); 72 base::Unretained(this)));
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 if (linkurl.empty()) { 174 if (linkurl.empty()) {
172 value.SetBoolean("linkurlisset", false); 175 value.SetBoolean("linkurlisset", false);
173 } else { 176 } else {
174 value.SetBoolean("linkurlisset", true); 177 value.SetBoolean("linkurlisset", true);
175 value.SetString("linkurl", linkurl); 178 value.SetString("linkurl", linkurl);
176 } 179 }
177 } 180 }
178 } 181 }
179 web_ui()->CallJavascriptFunction("syncMessageChanged", value); 182 web_ui()->CallJavascriptFunction("syncMessageChanged", value);
180 } 183 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/foreign_session_handler.cc ('k') | chrome/browser/ui/webui/ntp/ntp_login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698