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

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

Issue 12088040: Add a SigninAllowed policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments and rebase to ToT. Created 7 years, 10 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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"
(...skipping 28 matching lines...) Expand all
39 // configurable. 39 // configurable.
40 static const char kSyncDefaultViewOnlineUrl[] = "http://docs.google.com"; 40 static const char kSyncDefaultViewOnlineUrl[] = "http://docs.google.com";
41 41
42 NewTabPageSyncHandler::NewTabPageSyncHandler() : sync_service_(NULL), 42 NewTabPageSyncHandler::NewTabPageSyncHandler() : sync_service_(NULL),
43 waiting_for_initial_page_load_(true) { 43 waiting_for_initial_page_load_(true) {
44 } 44 }
45 45
46 NewTabPageSyncHandler::~NewTabPageSyncHandler() { 46 NewTabPageSyncHandler::~NewTabPageSyncHandler() {
47 if (sync_service_) 47 if (sync_service_)
48 sync_service_->RemoveObserver(this); 48 sync_service_->RemoveObserver(this);
49 profile_pref_registrar_.RemoveAll();
Dan Beam 2013/02/25 17:35:08 probably isn't necessary. https://code.google.com/
49 } 50 }
50 51
51 // static 52 // static
52 NewTabPageSyncHandler::MessageType 53 NewTabPageSyncHandler::MessageType
53 NewTabPageSyncHandler::FromSyncStatusMessageType( 54 NewTabPageSyncHandler::FromSyncStatusMessageType(
54 sync_ui_util::MessageType type) { 55 sync_ui_util::MessageType type) {
55 switch (type) { 56 switch (type) {
56 case sync_ui_util::SYNC_ERROR: 57 case sync_ui_util::SYNC_ERROR:
57 return SYNC_ERROR; 58 return SYNC_ERROR;
58 case sync_ui_util::SYNC_PROMO: 59 case sync_ui_util::SYNC_PROMO:
59 return SYNC_PROMO; 60 return SYNC_PROMO;
60 case sync_ui_util::PRE_SYNCED: 61 case sync_ui_util::PRE_SYNCED:
61 case sync_ui_util::SYNCED: 62 case sync_ui_util::SYNCED:
62 default: 63 default:
63 return HIDE; 64 return HIDE;
64 } 65 }
65 } 66 }
66 67
67 void NewTabPageSyncHandler::RegisterMessages() { 68 void NewTabPageSyncHandler::RegisterMessages() {
68 sync_service_ = ProfileSyncServiceFactory::GetInstance()->GetForProfile( 69 sync_service_ = ProfileSyncServiceFactory::GetInstance()->GetForProfile(
69 Profile::FromWebUI(web_ui())); 70 Profile::FromWebUI(web_ui()));
70 if (sync_service_) 71 if (sync_service_)
71 sync_service_->AddObserver(this); 72 sync_service_->AddObserver(this);
73 profile_pref_registrar_.Init(Profile::FromWebUI(web_ui())->GetPrefs());
74 profile_pref_registrar_.Add(
75 prefs::kSigninAllowed,
76 base::Bind(&NewTabPageSyncHandler::OnSigninAllowedPrefChange,
77 base::Unretained(this)));
72 78
73 web_ui()->RegisterMessageCallback("GetSyncMessage", 79 web_ui()->RegisterMessageCallback("GetSyncMessage",
74 base::Bind(&NewTabPageSyncHandler::HandleGetSyncMessage, 80 base::Bind(&NewTabPageSyncHandler::HandleGetSyncMessage,
75 base::Unretained(this))); 81 base::Unretained(this)));
76 web_ui()->RegisterMessageCallback("SyncLinkClicked", 82 web_ui()->RegisterMessageCallback("SyncLinkClicked",
77 base::Bind(&NewTabPageSyncHandler::HandleSyncLinkClicked, 83 base::Bind(&NewTabPageSyncHandler::HandleSyncLinkClicked,
78 base::Unretained(this))); 84 base::Unretained(this)));
79 } 85 }
80 86
81 void NewTabPageSyncHandler::HandleGetSyncMessage(const ListValue* args) { 87 void NewTabPageSyncHandler::HandleGetSyncMessage(const ListValue* args) {
82 waiting_for_initial_page_load_ = false; 88 waiting_for_initial_page_load_ = false;
83 BuildAndSendSyncStatus(); 89 BuildAndSendSyncStatus();
84 } 90 }
85 91
86 void NewTabPageSyncHandler::HideSyncStatusSection() { 92 void NewTabPageSyncHandler::HideSyncStatusSection() {
87 SendSyncMessageToPage(HIDE, std::string(), std::string()); 93 SendSyncMessageToPage(HIDE, std::string(), std::string());
88 } 94 }
89 95
90 void NewTabPageSyncHandler::BuildAndSendSyncStatus() { 96 void NewTabPageSyncHandler::BuildAndSendSyncStatus() {
91 DCHECK(!waiting_for_initial_page_load_); 97 DCHECK(!waiting_for_initial_page_load_);
98 SigninManager* signin = SigninManagerFactory::GetForProfile(
99 Profile::FromWebUI(web_ui()));
92 100
93 // Hide the sync status section if sync is managed or disabled entirely. 101 // Hide the sync status section if sync is managed or disabled entirely.
94 if (!sync_service_ || sync_service_->IsManaged()) { 102 if (!sync_service_ ||
103 sync_service_->IsManaged() ||
104 !signin ||
105 !signin->IsSigninAllowed()) {
95 HideSyncStatusSection(); 106 HideSyncStatusSection();
96 return; 107 return;
97 } 108 }
98 109
99 // Don't show sync status if setup is not complete. 110 // Don't show sync status if setup is not complete.
100 if (!sync_service_->HasSyncSetupCompleted()) { 111 if (!sync_service_->HasSyncSetupCompleted()) {
101 return; 112 return;
102 } 113 }
103 114
104 // Once sync has been enabled, the supported "sync statuses" for the NNTP 115 // Once sync has been enabled, the supported "sync statuses" for the NNTP
105 // from the user's perspective are: 116 // from the user's perspective are:
106 // 117 //
107 // "Sync error", when we can't authenticate or establish a connection with 118 // "Sync error", when we can't authenticate or establish a connection with
108 // the sync server (appropriate information appended to 119 // the sync server (appropriate information appended to
109 // message). 120 // message).
110 string16 status_msg; 121 string16 status_msg;
111 string16 link_text; 122 string16 link_text;
112 SigninManager* signin = SigninManagerFactory::GetForProfile(
113 Profile::FromWebUI(web_ui()));
114 123
115 sync_ui_util::MessageType type = 124 sync_ui_util::MessageType type =
116 sync_ui_util::GetStatusLabelsForNewTabPage(sync_service_, 125 sync_ui_util::GetStatusLabelsForNewTabPage(sync_service_,
117 *signin, 126 *signin,
118 &status_msg, 127 &status_msg,
119 &link_text); 128 &link_text);
120 SendSyncMessageToPage(FromSyncStatusMessageType(type), 129 SendSyncMessageToPage(FromSyncStatusMessageType(type),
121 UTF16ToUTF8(status_msg), UTF16ToUTF8(link_text)); 130 UTF16ToUTF8(status_msg), UTF16ToUTF8(link_text));
122 } 131 }
123 132
(...skipping 20 matching lines...) Expand all
144 } 153 }
145 } 154 }
146 155
147 void NewTabPageSyncHandler::OnStateChanged() { 156 void NewTabPageSyncHandler::OnStateChanged() {
148 // Don't do anything if the page has not yet loaded. 157 // Don't do anything if the page has not yet loaded.
149 if (waiting_for_initial_page_load_) 158 if (waiting_for_initial_page_load_)
150 return; 159 return;
151 BuildAndSendSyncStatus(); 160 BuildAndSendSyncStatus();
152 } 161 }
153 162
163 void NewTabPageSyncHandler::OnSigninAllowedPrefChange() {
164 // Don't do anything if the page has not yet loaded.
165 if (waiting_for_initial_page_load_)
166 return;
167 BuildAndSendSyncStatus();
168 }
169
154 void NewTabPageSyncHandler::SendSyncMessageToPage( 170 void NewTabPageSyncHandler::SendSyncMessageToPage(
155 MessageType type, std::string msg, 171 MessageType type, std::string msg,
156 std::string linktext) { 172 std::string linktext) {
157 DictionaryValue value; 173 DictionaryValue value;
158 std::string user; 174 std::string user;
159 std::string title; 175 std::string title;
160 std::string linkurl; 176 std::string linkurl;
161 177
162 // If there is nothing to show, we should hide the sync section altogether. 178 // If there is nothing to show, we should hide the sync section altogether.
163 if (type == HIDE || (msg.empty() && linktext.empty())) { 179 if (type == HIDE || (msg.empty() && linktext.empty())) {
(...skipping 22 matching lines...) Expand all
186 if (linkurl.empty()) { 202 if (linkurl.empty()) {
187 value.SetBoolean("linkurlisset", false); 203 value.SetBoolean("linkurlisset", false);
188 } else { 204 } else {
189 value.SetBoolean("linkurlisset", true); 205 value.SetBoolean("linkurlisset", true);
190 value.SetString("linkurl", linkurl); 206 value.SetString("linkurl", linkurl);
191 } 207 }
192 } 208 }
193 } 209 }
194 web_ui()->CallJavascriptFunction("ntp.syncMessageChanged", value); 210 web_ui()->CallJavascriptFunction("ntp.syncMessageChanged", value);
195 } 211 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698