Added interstitial page for merge session.

chrome/browser/chromeos/login/merge_session_load_page.h

Index: chrome/browser/chromeos/login/merge_session_load_page.h
diff --git a/chrome/browser/chromeos/login/merge_session_load_page.h b/chrome/browser/chromeos/login/merge_session_load_page.h
new file mode 100644
index 0000000000000000000000000000000000000000..f606e5d74a1d1c15de5634dbde62296e0cc83d3d
--- /dev/null
+++ b/chrome/browser/chromeos/login/merge_session_load_page.h
@@ -0,0 +1,87 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_
+
+#include <string>
+
+#include "base/callback.h"
+#include "base/compiler_specific.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
+#include "content/public/browser/interstitial_page_delegate.h"
+#include "googleurl/src/gurl.h"
+
+namespace base {
+class DictionaryValue;
+}
+
+namespace content {
+class InterstitialPage;
+class WebContents;
+}
+
+namespace extensions {
+class Extension;
+}
+
+namespace chromeos {
+
+// MergeSessionLoadPage class shows the interstitial page that is shown
+// while we are trying to restore session containing tabs with Google properties
+// during the process of exchanging OAuth2 refresh token for user cookies.
+// It deletes itself when the interstitial page is closed.
+class MergeSessionLoadPage
+    : public content::InterstitialPageDelegate,
+      public UserManager::Observer {
+ public:
+  // Passed a boolean indicating whether or not it is OK to proceed with the
+  // page load.
+  typedef base::Callback<void(bool /*proceed*/)> CompletionCallback;

[oshima, 2013/02/15 22:40:52]

optional nit: it'd be more readable wit enum rather than bool

[zel, 2013/02/15 23:16:58]

don't need bool either... removed

+
+  // Create a merge session load delay page for the |web_contents|.
+  // The |callback| will be run on the IO thread.
+  MergeSessionLoadPage(content::WebContents* web_contents,
+                       const GURL& url,
+                       const CompletionCallback& callback);
+
+  void Show();
+
+ protected:
+  virtual ~MergeSessionLoadPage();
+
+  // Overridden by tests.
+  virtual void NotifyBlockingPageComplete(bool proceed) OVERRIDE;

[xiyuan, 2013/02/15 23:43:07]

Test seems no longer uses it.

[zel, 2013/02/15 23:51:05]

Done.

+
+ private:
+  friend class TestMergeSessionLoadPage;
+
+  // InterstitialPageDelegate implementation.
+  virtual std::string GetHTMLContents() OVERRIDE;
+  virtual void CommandReceived(const std::string& command) OVERRIDE;
+  virtual void OverrideRendererPrefs(
+      content::RendererPreferences* prefs) OVERRIDE;
+  virtual void OnProceed() OVERRIDE;
+  virtual void OnDontProceed() OVERRIDE;
+
+  // UserManager::Observer overrides.
+  virtual void MergeSessionStateChanged(
+      UserManager::MergeSessionState state) OVERRIDE;
+  virtual void LocalStateChanged(UserManager* user_manager) OVERRIDE {}
+
+  CompletionCallback callback_;
+
+  // True if the proceed is chosen.
+  bool proceeded_;
+
+  content::WebContents* web_contents_;
+  GURL url_;
+  content::InterstitialPage* interstitial_page_;  // Owns us.
+
+  DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPage);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_