Add Phone/Tablet device types for syncing session from Android.

chrome/browser/sync/glue/session_model_associator.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stringprintf.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/glue/synced_session_tracker.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
 #include "chrome/browser/sync/glue/synced_window_delegate.h"
+#include "chrome/browser/sync/protocol/session_specifics.pb.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 
 class Profile;
 class ProfileSyncService;
 
 namespace sync_api {
 class BaseTransaction;
 class ReadNode;
 class WriteTransaction;
 }  // namespace sync_api
@@ skipping 381 matching lines @@
   // Returns true if this tab belongs to this profile and belongs to a window,
   // false otherwise.
   bool IsValidTab(const SyncedTabDelegate& tab) const;
 
   // Having a valid entry is defined as the url being valid and and having a
   // syncable scheme (non chrome:// and file:// url's). In other words, we don't
   // want to sync a tab that is nothing but chrome:// and file:// navigations or
   // invalid url's.
   bool TabHasValidEntry(const SyncedTabDelegate& tab) const;
 
+  // Returns the type of the device hosting this session.
+  sync_pb::SessionHeader::DeviceType GetLocalDeviceType();

[Nicolas Zea, 2012/03/14 18:27:14]

Does this have to be exposed via header? If so, perhaps have this one return the
SyncedSession::DeviceType which calls a separate anonymous namespace one in the
cc that returns the protobuf..

[Yaron, 2012/03/14 19:01:01]

Done.

+
   // For testing only.
   void QuitLoopForSubtleTesting();
 
   // Unique client tag.
   std::string current_machine_tag_;
 
   // User-visible machine name.
   std::string current_session_name_;
 
   // Pool of all used/available sync nodes associated with tabs.
@@ skipping 25 matching lines @@
 
   // Profile being synced.
   const Profile* const profile_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_