chrome/browser/ui/tab_contents/tab_contents.h - Issue 10968003: Add rendering support to the TestShell.

Side by Side Diff: chrome/browser/ui/tab_contents/tab_contents.h

Issue 10968003: Add rendering support to the TestShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased on top of test apk changes. Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« chrome/browser/android/tab_base_android_impl.cc ('K') | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/chrome_android.gypi » ('j') | no next file with comments »

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 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_	5 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_

6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_	6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

(...skipping 111 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
122 friend class ExtensionTabUtil;	122 friend class ExtensionTabUtil;

123 friend class ExternalTabContainerWin;	123 friend class ExternalTabContainerWin;

124 friend class FindBackendTestContentsCreator;	124 friend class FindBackendTestContentsCreator;

125 friend class GeolocationPermissionContextTests;	125 friend class GeolocationPermissionContextTests;

126 friend class InfoBarControllerContentsCreator;	126 friend class InfoBarControllerContentsCreator;

127 friend class InstantLoader;	127 friend class InstantLoader;

128 friend class OffscreenTabContentsCreator;	128 friend class OffscreenTabContentsCreator;

129 friend class PanelHost;	129 friend class PanelHost;

130 friend class prerender::PrerenderContents;	130 friend class prerender::PrerenderContents;

131 friend class ShellWindow;	131 friend class ShellWindow;

	132 friend class TabAndroid;
	Yaron 2012/09/24 20:11:32 You may want to fix (see comment above). You can a You may want to fix (see comment above). You can ask avi@ about this or I can help look. David Trainor- moved to gerrit 2012/09/24 23:39:57 Talked to Avi. Got rid of our reliance on a TabCo Talked to Avi. Got rid of our reliance on a TabContents, now we store and use the WebContents pointer directly. On 2012/09/24 20:11:32, Yaron wrote: Show quoted text > You may want to fix (see comment above). You can ask avi@ about this or I can > help look.
132 friend class TabContentsTestHarness;	133 friend class TabContentsTestHarness;

133 friend class TabStripModel;	134 friend class TabStripModel;

134 friend class TabStripModelContentsCreator;	135 friend class TabStripModelContentsCreator;

135 friend class TranslationInfoBarTestContentsCreator;	136 friend class TranslationInfoBarTestContentsCreator;

136 friend class WebDialogGtk;	137 friend class WebDialogGtk;

137 friend class WebDialogWindowControllerTabContentsCreator;	138 friend class WebDialogWindowControllerTabContentsCreator;

138 friend class WebIntentInlineDispositionBrowserTest;	139 friend class WebIntentInlineDispositionBrowserTest;

139 friend class WebIntentPickerCocoa;	140 friend class WebIntentPickerCocoa;

140 friend class WebIntentPickerGtk;	141 friend class WebIntentPickerGtk;

141 friend class WebUITestContentsCreator;	142 friend class WebUITestContentsCreator;

(...skipping 158 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
300	301

301 // The supporting objects need to outlive the WebContents dtor (as they may	302 // The supporting objects need to outlive the WebContents dtor (as they may

302 // be called upon during its execution). As a result, this must come last	303 // be called upon during its execution). As a result, this must come last

303 // in the list.	304 // in the list.

304 scoped_ptr<content::WebContents> web_contents_;	305 scoped_ptr<content::WebContents> web_contents_;

305	306

306 DISALLOW_COPY_AND_ASSIGN(TabContents);	307 DISALLOW_COPY_AND_ASSIGN(TabContents);

307 };	308 };

308	309

309 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_	310 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_

OLD	NEW