| 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/tab_contents_synced_tab_delegate.h" | 5 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" |
| 6 | 6 |
| 7 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/sessions/session_tab_helper.h" | 9 #include "chrome/browser/sessions/session_tab_helper.h" |
| 10 #include "chrome/browser/sync/glue/synced_window_delegate.h" | 10 #include "chrome/browser/sync/glue/synced_window_delegate.h" |
| 11 #include "content/public/browser/navigation_controller.h" | 11 #include "content/public/browser/navigation_controller.h" |
| 12 #include "content/public/browser/navigation_entry.h" | 12 #include "content/public/browser/navigation_entry.h" |
| 13 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
| 14 #include "extensions/common/extension.h" | |
| 15 | 14 |
| 16 #if defined(ENABLE_EXTENSIONS) | 15 #if defined(ENABLE_EXTENSIONS) |
| 17 #include "chrome/browser/extensions/tab_helper.h" | 16 #include "chrome/browser/extensions/tab_helper.h" |
| 17 #include "extensions/common/extension.h" |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 #if defined(ENABLE_MANAGED_USERS) | 20 #if defined(ENABLE_MANAGED_USERS) |
| 21 #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h" | 21 #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 using content::NavigationEntry; | 24 using content::NavigationEntry; |
| 25 | 25 |
| 26 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TabContentsSyncedTabDelegate); | 26 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TabContentsSyncedTabDelegate); |
| 27 | 27 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 return web_contents_; | 112 return web_contents_; |
| 113 } | 113 } |
| 114 | 114 |
| 115 int TabContentsSyncedTabDelegate::GetSyncId() const { | 115 int TabContentsSyncedTabDelegate::GetSyncId() const { |
| 116 return sync_session_id_; | 116 return sync_session_id_; |
| 117 } | 117 } |
| 118 | 118 |
| 119 void TabContentsSyncedTabDelegate::SetSyncId(int sync_id) { | 119 void TabContentsSyncedTabDelegate::SetSyncId(int sync_id) { |
| 120 sync_session_id_ = sync_id; | 120 sync_session_id_ = sync_id; |
| 121 } | 121 } |
| OLD | NEW |