| Index: chrome/browser/sync/glue/synced_tab_delegate_desktop.cc
|
| diff --git a/chrome/browser/sync/glue/synced_tab_delegate_desktop.cc b/chrome/browser/sync/glue/synced_tab_delegate_desktop.cc
|
| index 195d0e0b240cb14229f717bd29c532fc48c026d1..a45f01d9509db1a7d7a6bdde3ad510cd846bc57d 100644
|
| --- a/chrome/browser/sync/glue/synced_tab_delegate_desktop.cc
|
| +++ b/chrome/browser/sync/glue/synced_tab_delegate_desktop.cc
|
| @@ -3,6 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "chrome/browser/sync/glue/synced_tab_delegate.h"
|
| +#include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"
|
| #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
|
|
|
| // This should be the version of ImplFromWebContents that's pulled in for non-
|
| @@ -17,7 +18,14 @@ namespace browser_sync {
|
| // static
|
| SyncedTabDelegate* SyncedTabDelegate::ImplFromWebContents(
|
| content::WebContents* web_contents) {
|
| - return TabContentsSyncedTabDelegate::FromWebContents(web_contents);
|
| + SyncedTabDelegate* delegate =
|
| + TabContentsSyncedTabDelegate::FromWebContents(web_contents);
|
| + if (!delegate) {
|
| + return NULL;
|
| + }
|
| + delegate->SetSyncedWindowGetter(make_scoped_ptr(
|
| + new BrowserSyncedWindowDelegatesGetter()));
|
| + return delegate;
|
| }
|
|
|
| } // namespace browser_sync
|
|
|