Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sessions / session_tab_helper.cc

diff --git a/src/chrome/browser/sessions/session_tab_helper.cc b/src/chrome/browser/sessions/session_tab_helper.cc
index 8435649..467ed22 100644 (file)
--- a/src/chrome/browser/sessions/session_tab_helper.cc
+++ b/src/chrome/browser/sessions/session_tab_helper.cc
@@ -11,7 +11,10 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+
+#if defined(ENABLE_EXTENSIONS)
 #include "extensions/common/extension_messages.h"
+#endif
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SessionTabHelper);
 
@@ -25,19 +28,38 @@ SessionTabHelper::~SessionTabHelper() {
 void SessionTabHelper::SetWindowID(const SessionID& id) {
   window_id_ = id;
 
+#if defined(ENABLE_EXTENSIONS)
   // Extension code in the renderer holds the ID of the window that hosts it.
   // Notify it that the window ID changed.
   web_contents()->GetRenderViewHost()->Send(
           new ExtensionMsg_UpdateBrowserWindowId(
           web_contents()->GetRenderViewHost()->GetRoutingID(), id.id()));
+#endif
+}
+
+// static
+SessionID::id_type SessionTabHelper::IdForTab(const content::WebContents* tab) {
+  const SessionTabHelper* session_tab_helper =
+      tab ? SessionTabHelper::FromWebContents(tab) : NULL;
+  return session_tab_helper ? session_tab_helper->session_id().id() : -1;
+}
+
+// static
+SessionID::id_type SessionTabHelper::IdForWindowContainingTab(
+    const content::WebContents* tab) {
+  const SessionTabHelper* session_tab_helper =
+      tab ? SessionTabHelper::FromWebContents(tab) : NULL;
+  return session_tab_helper ? session_tab_helper->window_id().id() : -1;
 }
 
+#if defined(ENABLE_EXTENSIONS)
 void SessionTabHelper::RenderViewCreated(
     content::RenderViewHost* render_view_host) {
   render_view_host->Send(
       new ExtensionMsg_UpdateBrowserWindowId(render_view_host->GetRoutingID(),
                                              window_id_.id()));
 }
+#endif
 
 void SessionTabHelper::UserAgentOverrideSet(const std::string& user_agent) {
 #if defined(ENABLE_SESSION_SERVICE)