| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h" | 5 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_finder.h" | 10 #include "chrome/browser/ui/browser_finder.h" |
| 11 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" | 11 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" |
| 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 13 #include "components/sessions/core/session_id.h" | 13 #include "components/sessions/core/session_id.h" |
| 14 | 14 |
| 15 // BrowserSyncedWindowDelegate implementations | |
| 16 | |
| 17 BrowserSyncedWindowDelegate::BrowserSyncedWindowDelegate(Browser* browser) | 15 BrowserSyncedWindowDelegate::BrowserSyncedWindowDelegate(Browser* browser) |
| 18 : browser_(browser) {} | 16 : browser_(browser) {} |
| 19 | 17 |
| 20 BrowserSyncedWindowDelegate::~BrowserSyncedWindowDelegate() {} | 18 BrowserSyncedWindowDelegate::~BrowserSyncedWindowDelegate() {} |
| 21 | 19 |
| 22 bool BrowserSyncedWindowDelegate::IsTabPinned( | 20 bool BrowserSyncedWindowDelegate::IsTabPinned( |
| 23 const browser_sync::SyncedTabDelegate* tab) const { | 21 const sync_sessions::SyncedTabDelegate* tab) const { |
| 24 for (int i = 0; i < browser_->tab_strip_model()->count(); i++) { | 22 for (int i = 0; i < browser_->tab_strip_model()->count(); i++) { |
| 25 browser_sync::SyncedTabDelegate* current = GetTabAt(i); | 23 sync_sessions::SyncedTabDelegate* current = GetTabAt(i); |
| 26 if (tab == current) | 24 if (tab == current) |
| 27 return browser_->tab_strip_model()->IsTabPinned(i); | 25 return browser_->tab_strip_model()->IsTabPinned(i); |
| 28 } | 26 } |
| 29 // The window and tab are not always updated atomically, so it's possible | 27 // The window and tab are not always updated atomically, so it's possible |
| 30 // one of the values was stale. We'll retry later, just ignore for now. | 28 // one of the values was stale. We'll retry later, just ignore for now. |
| 31 return false; | 29 return false; |
| 32 } | 30 } |
| 33 | 31 |
| 34 browser_sync::SyncedTabDelegate* BrowserSyncedWindowDelegate::GetTabAt( | 32 sync_sessions::SyncedTabDelegate* BrowserSyncedWindowDelegate::GetTabAt( |
| 35 int index) const { | 33 int index) const { |
| 36 return TabContentsSyncedTabDelegate::FromWebContents( | 34 return TabContentsSyncedTabDelegate::FromWebContents( |
| 37 browser_->tab_strip_model()->GetWebContentsAt(index)); | 35 browser_->tab_strip_model()->GetWebContentsAt(index)); |
| 38 } | 36 } |
| 39 | 37 |
| 40 SessionID::id_type BrowserSyncedWindowDelegate::GetTabIdAt(int index) const { | 38 SessionID::id_type BrowserSyncedWindowDelegate::GetTabIdAt(int index) const { |
| 41 return GetTabAt(index)->GetSessionId(); | 39 return GetTabAt(index)->GetSessionId(); |
| 42 } | 40 } |
| 43 | 41 |
| 44 bool BrowserSyncedWindowDelegate::HasWindow() const { | 42 bool BrowserSyncedWindowDelegate::HasWindow() const { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 71 | 69 |
| 72 bool BrowserSyncedWindowDelegate::IsSessionRestoreInProgress() const { | 70 bool BrowserSyncedWindowDelegate::IsSessionRestoreInProgress() const { |
| 73 return false; | 71 return false; |
| 74 } | 72 } |
| 75 | 73 |
| 76 bool BrowserSyncedWindowDelegate::ShouldSync() const { | 74 bool BrowserSyncedWindowDelegate::ShouldSync() const { |
| 77 if (IsApp()) | 75 if (IsApp()) |
| 78 return false; | 76 return false; |
| 79 return IsTypeTabbed() || IsTypePopup(); | 77 return IsTypeTabbed() || IsTypePopup(); |
| 80 } | 78 } |
| OLD | NEW |