Merge 114608, 115692 to 963 (M17) branch.

chrome/browser/ui/webui/sync_promo/sync_promo_ui.h

Index: chrome/browser/ui/webui/sync_promo/sync_promo_ui.h
diff --git a/chrome/browser/ui/webui/sync_promo_ui.h b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.h
similarity index 87%
rename from chrome/browser/ui/webui/sync_promo_ui.h
rename to chrome/browser/ui/webui/sync_promo/sync_promo_ui.h
index d089406e0283a38b1b303b28816420a03c6089a8..5079c1063d5e4b24e00bd3807f9754c1c0bf1c12 100644
--- a/chrome/browser/ui/webui/sync_promo_ui.h
+++ b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_UI_H_
 #pragma once
 
 #include "chrome/browser/ui/webui/chrome_web_ui.h"
@@ -30,6 +30,9 @@ class SyncPromoUI : public ChromeWebUI {
   // of the number of times we've displayed it.
   static void DidShowSyncPromoAtStartup(Profile* profile);
 
+  // Returns true if a user has seen the sync promo at startup previously.
+  static bool HasShownPromoAtStartup(Profile* profile);
+
   // Returns true if the user has previously skipped the sync promo.
   static bool HasUserSkippedSyncPromo(Profile* profile);
 
@@ -58,4 +61,4 @@ class SyncPromoUI : public ChromeWebUI {
   DISALLOW_COPY_AND_ASSIGN(SyncPromoUI);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_UI_H_