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

Side by Side Diff: chrome/browser/ui/webui/sync_setup_handler.cc

Issue 7610008: Sync Promo: Show profile avatar next to user name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build issues Created 9 years, 4 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
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_sync_setup_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/sync_setup_handler.h" 5 #include "chrome/browser/ui/webui/sync_setup_handler.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 { "cancelWarning", IDS_SYNC_PASSPHRASE_CANCEL_WARNING }, 261 { "cancelWarning", IDS_SYNC_PASSPHRASE_CANCEL_WARNING },
262 { "yes", IDS_SYNC_PASSPHRASE_CANCEL_YES }, 262 { "yes", IDS_SYNC_PASSPHRASE_CANCEL_YES },
263 { "no", IDS_SYNC_PASSPHRASE_CANCEL_NO }, 263 { "no", IDS_SYNC_PASSPHRASE_CANCEL_NO },
264 { "sectionExplicitMessagePrefix", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX }, 264 { "sectionExplicitMessagePrefix", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX },
265 { "sectionExplicitMessagePostfix", 265 { "sectionExplicitMessagePostfix",
266 IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_POSTFIX }, 266 IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_POSTFIX },
267 { "encryptedDataTypesTitle", IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE }, 267 { "encryptedDataTypesTitle", IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE },
268 { "encryptSensitiveOption", IDS_SYNC_ENCRYPT_SENSITIVE_DATA }, 268 { "encryptSensitiveOption", IDS_SYNC_ENCRYPT_SENSITIVE_DATA },
269 { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA }, 269 { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA },
270 { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA }, 270 { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA },
271 { "statusNotConnected", IDS_SYNC_STATUS_NOT_CONNECTED }
272 }; 271 };
273 272
274 RegisterStrings(localized_strings, resources, arraysize(resources)); 273 RegisterStrings(localized_strings, resources, arraysize(resources));
275 } 274 }
276 275
277 void SyncSetupHandler::Initialize() { 276 void SyncSetupHandler::Initialize() {
278 } 277 }
279 278
280 void SyncSetupHandler::RegisterMessages() { 279 void SyncSetupHandler::RegisterMessages() {
281 web_ui_->RegisterMessageCallback("SyncSetupDidClosePage", 280 web_ui_->RegisterMessageCallback("SyncSetupDidClosePage",
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 ShowSetupUI(); 478 ShowSetupUI();
480 479
481 // The SyncSetupFlow will set itself as the |flow_|. 480 // The SyncSetupFlow will set itself as the |flow_|.
482 if (!service->get_wizard().AttachSyncSetupHandler(this)) { 481 if (!service->get_wizard().AttachSyncSetupHandler(this)) {
483 // If attach fails, a wizard is already activated and attached to a flow 482 // If attach fails, a wizard is already activated and attached to a flow
484 // handler. 483 // handler.
485 web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay"); 484 web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay");
486 service->get_wizard().Focus(); 485 service->get_wizard().Focus();
487 } 486 }
488 } 487 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_sync_setup_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698