From 4b8813febe897d7b8c1a736e01d8dfdb900d92a4 Mon Sep 17 00:00:00 2001 From: "qsr@chromium.org" Date: Wed, 11 Jan 2012 12:44:49 +0000 Subject: 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 --- chrome/browser/ui/tab_contents/tab_contents_wrapper.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'chrome/browser/ui/tab_contents') 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 search_engine_tab_helper_; scoped_ptr snapshot_tab_helper_; scoped_ptr ssl_helper_; - scoped_ptr synced_tab_delegate_; + scoped_ptr synced_tab_delegate_; // The TabSpecificContentSettings object is used to query the blocked content // state by various UI elements. -- cgit v1.1