Add a sign-in promo message to the Other Devices menu.

chrome/browser/ui/webui/ntp/foreign_session_handler.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/ntp/foreign_session_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_ui.h"
 
 namespace browser_sync {
 
 // Maximum number of session we're going to display on the NTP
-static const int kMaxSessionsToShow = 10;
+static const size_t kMaxSessionsToShow = 10;
 
 // Invalid value, used to note that we don't have a tab or window number.
 static const int kInvalidId = -1;
 
 ForeignSessionHandler::ForeignSessionHandler() {
 }
 
 void ForeignSessionHandler::RegisterMessages() {
   Init();
   web_ui()->RegisterMessageCallback("getForeignSessions",
@@ skipping 15 matching lines @@
 }
 
 void ForeignSessionHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   ListValue list_value;
   switch (type) {
     case chrome::NOTIFICATION_SYNC_CONFIGURE_DONE:
     case chrome::NOTIFICATION_FOREIGN_SESSION_UPDATED:
+    case chrome::NOTIFICATION_FOREIGN_SESSION_DISABLED:
       HandleGetForeignSessions(&list_value);
       break;
-    case chrome::NOTIFICATION_FOREIGN_SESSION_DISABLED:
-      // Calling foreignSessions with empty list will automatically hide
-      // foreign session section.
-      web_ui()->CallJavascriptFunction("ntp.foreignSessions", list_value);
-      break;
     default:
       NOTREACHED();
   }
 }
 
 SessionModelAssociator* ForeignSessionHandler::GetModelAssociator() {
   ProfileSyncService* service(ProfileSyncServiceFactory::
       GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));
   if (service == NULL)
     return NULL;
 
   // We only want to set the model associator if there is one, and it is done
   // syncing sessions.
   SessionModelAssociator* model_associator =
       service->GetSessionModelAssociator();
   if (!service->ShouldPushChanges())
     return NULL;
   return model_associator;
 }
 
+bool ForeignSessionHandler::IsTabSyncEnabled() {
+  ProfileSyncService* service(ProfileSyncServiceFactory::
+      GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));
+  return service && service->GetSessionModelAssociator() != NULL;

[Dan Beam, 2012/03/26 23:18:54]

nit: remove "!= NULL" if possible, IMO

[Patrick Dubroy, 2012/03/27 00:36:51]

Done.

+}
+
 void ForeignSessionHandler::HandleGetForeignSessions(const ListValue* args) {
   SessionModelAssociator* associator = GetModelAssociator();
   std::vector<const SyncedSession*> sessions;
 
-  if (associator == NULL) {
-    // Called before associator created, exit.
-    return;
+  ListValue session_list;
+  if (associator && associator->GetAllForeignSessions(&sessions)) {
+    // Note: we don't own the SyncedSessions themselves.
+    for (size_t i = 0; i < sessions.size() && i < kMaxSessionsToShow; ++i) {
+      const SyncedSession* session = sessions[i];
+      scoped_ptr<DictionaryValue> session_data(new DictionaryValue());
+      session_data->SetString("tag", session->session_tag);
+      session_data->SetString("name", session->session_name);
+      scoped_ptr<ListValue> window_list(new ListValue());
+      for (SyncedSession::SyncedWindowMap::const_iterator it =
+          session->windows.begin(); it != session->windows.end(); ++it) {

[Dan Beam, 2012/03/26 23:18:54]

nit: +1 \s

[Patrick Dubroy, 2012/03/27 00:36:51]

Done.

+        SessionWindow* window = it->second;
+        scoped_ptr<DictionaryValue> window_data(new DictionaryValue());
+        if (SessionWindowToValue(*window, window_data.get()))
+          window_list->Append(window_data.release());
+      }
+      session_data->Set("windows", window_list.release());
+      session_list.Append(session_data.release());
+    }
   }
-
-  // Note: we don't own the SyncedSessions themselves.
-  if (!associator->GetAllForeignSessions(&sessions)) {
-    LOG(ERROR) << "ForeignSessionHandler failed to get session data from"
-        "SessionModelAssociator.";
-    return;
-  }
-  int added_count = 0;
-  ListValue session_list;
-  for (std::vector<const SyncedSession*>::const_iterator i =
-      sessions.begin(); i != sessions.end() &&
-      added_count < kMaxSessionsToShow; ++i) {
-    const SyncedSession* session = *i;
-    scoped_ptr<DictionaryValue> session_data(new DictionaryValue());
-    session_data->SetString("tag", session->session_tag);
-    session_data->SetString("name", session->session_name);
-    scoped_ptr<ListValue> window_list(new ListValue());
-    for (SyncedSession::SyncedWindowMap::const_iterator it =
-        session->windows.begin(); it != session->windows.end(); ++it) {
-      SessionWindow* window = it->second;
-      scoped_ptr<DictionaryValue> window_data(new DictionaryValue());
-      if (SessionWindowToValue(*window, window_data.get())) {
-        window_list->Append(window_data.release());
-      }
-    }
-    session_data->Set("windows", window_list.release());
-    session_list.Append(session_data.release());
-    added_count++;
-  }
-  web_ui()->CallJavascriptFunction("ntp.foreignSessions", session_list);
+  base::FundamentalValue tab_sync_enabled(IsTabSyncEnabled());
+  web_ui()->CallJavascriptFunction("ntp.foreignSessions",
+                                   session_list,
+                                   tab_sync_enabled);
 }
 
 void ForeignSessionHandler::HandleOpenForeignSession(
     const ListValue* args) {
   size_t num_args = args->GetSize();
   // Expect either 2 or 8 args. For restoring an entire window, only
   // two arguments are required -- the session tag and the window id.
   // To restore a tab, the additional args required are the tab id,
   // and 4 properties of the event object (button, altKey, ctrlKey,
   // metaKey, shiftKey) for determining how to open the tab.
@@ skipping 100 matching lines @@
     return false;
   dictionary->SetString("type", "window");
   dictionary->SetDouble("timestamp",
       static_cast<double>(window.timestamp.ToInternalValue()));
   dictionary->SetInteger("sessionId", window.window_id.id());
   dictionary->Set("tabs", tab_values.release());
   return true;
 }
 
 }  // namespace browser_sync