diff options
author | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 12:44:49 +0000 |
---|---|---|
committer | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 12:44:49 +0000 |
commit | 4b8813febe897d7b8c1a736e01d8dfdb900d92a4 (patch) | |
tree | e0b45eecf540d0665eca8226db773a76c4a1b314 /chrome/browser/ui/tab_contents | |
parent | 3a9d5ed281f01b6ff1024a7b177966079e1992d8 (diff) | |
download | chromium_src-4b8813febe897d7b8c1a736e01d8dfdb900d92a4.zip chromium_src-4b8813febe897d7b8c1a736e01d8dfdb900d92a4.tar.gz chromium_src-4b8813febe897d7b8c1a736e01d8dfdb900d92a4.tar.bz2 |
Revert 117206 - Use interface for SyncedTabDelegate in TabContentsWrapper
TabContentsWrapper was directly referencing the implementation of
SyncedTabDelegate, instead of the interface in its header.
This prevents writing other implementation of the SyncedTabDelegate.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9149002
TBR=qsr@chromium.org
Review URL: http://codereview.chromium.org/9190003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tab_contents')
-rw-r--r-- | chrome/browser/ui/tab_contents/tab_contents_wrapper.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h index f3433f4..fe6cc7b 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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. @@ -46,15 +46,12 @@ class SadTabObserver; class SearchEngineTabHelper; class SnapshotTabHelper; class TabContentsSSLHelper; +class TabContentsWrapperSyncedTabDelegate; class TabSpecificContentSettings; class ThumbnailGenerator; class TranslateTabHelper; class WebIntentPickerController; -namespace browser_sync { -class SyncedTabDelegate; -} - namespace prerender { class PrerenderTabHelper; } @@ -171,7 +168,7 @@ class TabContentsWrapper : public content::WebContentsObserver { TabContentsSSLHelper* ssl_helper() { return ssl_helper_.get(); } - browser_sync::SyncedTabDelegate* synced_tab_delegate() { + TabContentsWrapperSyncedTabDelegate* synced_tab_delegate() { return synced_tab_delegate_.get(); } @@ -233,7 +230,7 @@ class TabContentsWrapper : public content::WebContentsObserver { scoped_ptr<SearchEngineTabHelper> search_engine_tab_helper_; scoped_ptr<SnapshotTabHelper> snapshot_tab_helper_; scoped_ptr<TabContentsSSLHelper> ssl_helper_; - scoped_ptr<browser_sync::SyncedTabDelegate> synced_tab_delegate_; + scoped_ptr<TabContentsWrapperSyncedTabDelegate> synced_tab_delegate_; // The TabSpecificContentSettings object is used to query the blocked content // state by various UI elements. |