Index: chrome/browser/ui/webui/settings/sync_handler.h |
diff --git a/chrome/browser/ui/webui/settings/sync_handler.h b/chrome/browser/ui/webui/settings/sync_handler.h |
index 9ac84ba6d1838207536e34ab131776605753a9f7..2de271957a5fcbddcb9d4b99db775199621d50c6 100644 |
--- a/chrome/browser/ui/webui/settings/sync_handler.h |
+++ b/chrome/browser/ui/webui/settings/sync_handler.h |
@@ -10,10 +10,12 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/prefs/pref_change_registrar.h" |
#include "base/scoped_observer.h" |
+#include "base/strings/utf_string_conversions.h" |
#include "base/timer/timer.h" |
#include "chrome/browser/sync/sync_startup_tracker.h" |
#include "chrome/browser/ui/webui/signin/login_ui_service.h" |
#include "components/signin/core/browser/signin_manager_base.h" |
+#include "components/signin/core/browser/signin_metrics.h" |
#include "components/sync_driver/sync_service_observer.h" |
#include "content/public/browser/web_ui_message_handler.h" |
@@ -59,7 +61,7 @@ class SyncHandler : public content::WebUIMessageHandler, |
void OnStateChanged() override; |
// Initializes the sync setup flow and shows the setup UI. |
- void OpenSyncSetup(); |
+ void OpenSyncSetup(const base::ListValue* args); |
// Shows advanced configuration dialog without going through sign in dialog. |
// Kicks the sync backend if necessary with showing spinner dialog until it |
@@ -126,11 +128,12 @@ class SyncHandler : public content::WebUIMessageHandler, |
#if !defined(OS_CHROMEOS) |
// Displays the GAIA login form. |
- void DisplayGaiaLogin(); |
+ void DisplayGaiaLogin(signin_metrics::AccessPoint access_point); |
// When web-flow is enabled, displays the Gaia login form in a new tab. |
// This function is virtual so that tests can override. |
- virtual void DisplayGaiaLoginInNewTabOrWindow(); |
+ virtual void DisplayGaiaLoginInNewTabOrWindow( |
+ signin_metrics::AccessPoint access_point); |
#endif |
// A utility function to call before actually showing setup dialog. Makes sure |