chrome/browser/automation/automation_util.cc - Issue 10409088: Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/automation/automation_util.cc

Issue 10409088: Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: review comments Created 8 years, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/automation/automation_provider_observers.cc ('k') | chrome/browser/automation/testing_automation_provider.cc » ('j') | chrome/browser/extensions/extension_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/automation/automation_util.cc

===================================================================

--- chrome/browser/automation/automation_util.cc (revision 138369)

+++ chrome/browser/automation/automation_util.cc (working copy)

@@ -25,13 +25,12 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

+#include "chrome/browser/view_type_utils.h"

#include "chrome/common/automation_id.h"

-#include "chrome/common/chrome_view_type.h"

#include "chrome/common/extensions/extension.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/render_view_host.h"

-#include "content/public/browser/render_view_host_delegate.h"

#include "content/public/browser/web_contents.h"

#include "net/cookies/cookie_monster.h"

#include "net/cookies/cookie_store.h"

@@ -416,7 +415,8 @@

AutomationId GetIdForExtensionView(

const content::RenderViewHost* render_view_host) {

AutomationId::Type type;

- switch (render_view_host->GetDelegate()->GetRenderViewType()) {

+ WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host);

+ switch (chrome::GetViewType(web_contents)) {

case chrome::VIEW_TYPE_EXTENSION_POPUP:

type = AutomationId::kTypeExtensionPopup;

break;