Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

chrome/browser/sync/glue/session_model_associator.cc

 // Copyright (c) 2011 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/sync/glue/session_model_associator.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 20 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_details.h"
 #if defined(OS_LINUX)
 #include "base/linux_util.h"
 #elif defined(OS_WIN)
 #include <windows.h>
 #endif
 
+using content::BrowserThread;
+using content::NavigationEntry;
+using syncable::SESSIONS;
+
 namespace browser_sync {
 
-using content::BrowserThread;
-using syncable::SESSIONS;
-
 namespace {
 static const char kNoSessionsFolderError[] =
     "Server did not create the top-level sessions node. We "
     "might be running against an out-of-date server.";
 
 // The maximum number of navigations in each direction we care to sync.
 static const int kMaxSyncNavigationCount = 6;
 
 // Default number of days without activity after which a session is considered
 // stale and becomes a candidate for garbage collection.
@@ skipping 273 matching lines @@
   const int min_index = std::max(0,
                                  current_index - kMaxSyncNavigationCount);
   const int max_index = std::min(current_index + kMaxSyncNavigationCount,
                                  tab.GetEntryCount());
   const int pending_index = tab.GetPendingEntryIndex();
   tab_s->set_pinned(window.IsTabPinned(&tab));
   if (tab.HasExtensionAppId()) {
     tab_s->set_extension_app_id(tab.GetExtensionAppId());
   }
   for (int i = min_index; i < max_index; ++i) {
-    const content::NavigationEntry* entry = (i == pending_index) ?
+    const NavigationEntry* entry = (i == pending_index) ?
        tab.GetPendingEntry() : tab.GetEntryAtIndex(i);
     DCHECK(entry);
     if (entry->GetVirtualURL().is_valid()) {
       if (i == max_index - 1) {
         DVLOG(1) << "Associating tab " << tab_id << " with sync id " << sync_id
                  << ", url " << entry->GetVirtualURL().possibly_invalid_spec()
                  << " and title " << entry->GetTitle();
       }
       TabNavigation tab_nav;
       tab_nav.SetFromNavigationEntry(*entry);
@@ skipping 707 matching lines @@
 // Valid local tab?
 bool SessionModelAssociator::IsValidTab(const SyncedTabDelegate& tab) const {
   DCHECK(CalledOnValidThread());
   if ((tab.profile() == sync_service_->profile() ||
        sync_service_->profile() == NULL)) {          // For tests.
     const SyncedWindowDelegate* window =
         SyncedWindowDelegate::FindSyncedWindowDelegateWithId(
             tab.GetWindowId());
     if (!window)
       return false;
-    const content::NavigationEntry* entry = tab.GetActiveEntry();
+    const NavigationEntry* entry = tab.GetActiveEntry();
     if (!entry)
       return false;
     if (entry->GetVirtualURL().is_valid() &&
         (entry->GetVirtualURL().GetOrigin() !=
             GURL(chrome::kChromeUINewTabURL) ||
          tab.GetEntryCount() > 1)) {
       return true;
     }
   }
   return false;
@@ skipping 174 matching lines @@
 bool SessionModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   const syncable::ModelTypeSet encrypted_types =
       sync_api::GetEncryptedTypes(&trans);
   return !encrypted_types.Has(SESSIONS) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync