content/browser/tab_contents/tab_contents.h - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

Side by Side Diff: content/browser/tab_contents/tab_contents.h

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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

« content/browser/tab_contents/render_view_host_manager_unittest.cc ('K') | « content/browser/tab_contents/render_view_host_manager_unittest.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | content/browser/webui/web_ui.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_	6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_

7 #pragma once	7 #pragma once

8	8

9 #include <deque>	9 #include <deque>

10 #include <map>	10 #include <map>

(...skipping 115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
126 virtual void SetDelegate(content::WebContentsDelegate* delegate) OVERRIDE;	126 virtual void SetDelegate(content::WebContentsDelegate* delegate) OVERRIDE;

127 virtual content::NavigationController& GetController() OVERRIDE;	127 virtual content::NavigationController& GetController() OVERRIDE;

128 virtual const content::NavigationController& GetController() const OVERRIDE;	128 virtual const content::NavigationController& GetController() const OVERRIDE;

129 virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;	129 virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;

130 virtual void SetViewType(content::ViewType type) OVERRIDE;	130 virtual void SetViewType(content::ViewType type) OVERRIDE;

131 virtual content::ViewType GetViewType() const OVERRIDE;	131 virtual content::ViewType GetViewType() const OVERRIDE;

132 virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE;	132 virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE;

133 virtual RenderViewHost* GetRenderViewHost() const OVERRIDE;	133 virtual RenderViewHost* GetRenderViewHost() const OVERRIDE;

134 virtual RenderWidgetHostView* GetRenderWidgetHostView() const OVERRIDE;	134 virtual RenderWidgetHostView* GetRenderWidgetHostView() const OVERRIDE;

135 virtual TabContentsView* GetView() const OVERRIDE;	135 virtual TabContentsView* GetView() const OVERRIDE;

	136 virtual WebUI* CreateWebUI(const GURL& url) OVERRIDE;

136 virtual WebUI* GetWebUI() const OVERRIDE;	137 virtual WebUI* GetWebUI() const OVERRIDE;

137 virtual WebUI* GetCommittedWebUI() const OVERRIDE;	138 virtual WebUI* GetCommittedWebUI() const OVERRIDE;

138 virtual const string16& GetTitle() const OVERRIDE;	139 virtual const string16& GetTitle() const OVERRIDE;

139 virtual int32 GetMaxPageID() OVERRIDE;	140 virtual int32 GetMaxPageID() OVERRIDE;

140 virtual int32 GetMaxPageIDForSiteInstance(	141 virtual int32 GetMaxPageIDForSiteInstance(

141 SiteInstance* site_instance) OVERRIDE;	142 SiteInstance* site_instance) OVERRIDE;

142 virtual SiteInstance* GetSiteInstance() const OVERRIDE;	143 virtual SiteInstance* GetSiteInstance() const OVERRIDE;

143 virtual SiteInstance* GetPendingSiteInstance() const OVERRIDE;	144 virtual SiteInstance* GetPendingSiteInstance() const OVERRIDE;

144 virtual bool IsLoading() const OVERRIDE;	145 virtual bool IsLoading() const OVERRIDE;

145 virtual bool IsWaitingForResponse() const OVERRIDE;	146 virtual bool IsWaitingForResponse() const OVERRIDE;

(...skipping 491 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
637 // (full-page plugins for now only) permissions.	638 // (full-page plugins for now only) permissions.

638 int content_restrictions_;	639 int content_restrictions_;

639	640

640 // Our view type. Default is VIEW_TYPE_TAB_CONTENTS.	641 // Our view type. Default is VIEW_TYPE_TAB_CONTENTS.

641 content::ViewType view_type_;	642 content::ViewType view_type_;

642	643

643 DISALLOW_COPY_AND_ASSIGN(TabContents);	644 DISALLOW_COPY_AND_ASSIGN(TabContents);

644 };	645 };

645	646

646 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_	647 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_

OLD	NEW