chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc - Issue 10387110: Remove VIEW_TYPE_WEB_CONTENTS and make default view type INVALID.

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/speech/chrome_speech_recognition_manager_delegate.cc

Issue 10387110: Remove VIEW_TYPE_WEB_CONTENTS and make default view type INVALID. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: blah 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/speech/chrome_speech_recognition_manager_delegate.h ('k') | chrome/browser/task_manager/task_manager_resource_providers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc

diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc

index 5a84d2c54335b319bd60bc4cdcff69c719697132..0f697ea01ed1fc252c12c4d2198ce0b2df498673 100644

--- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc

+++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/tab_contents/tab_util.h"

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

#include "chrome/common/pref_names.h"

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

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

@@ -235,7 +236,7 @@ void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType(

const content::RenderViewHost* render_view_host =

content::RenderViewHost::FromID(render_process_id, render_view_id);

- // For host delegates other than VIEW_TYPE_WEB_CONTENTS we can't reliably show

+ // For host delegates other than VIEW_TYPE_TAB_CONTENTS we can't reliably show

// a popup, including the speech input bubble. In these cases for privacy

// reasons we don't want to start recording if the user can't be properly

// notified. An example of this is trying to show the speech input bubble

@@ -245,7 +246,7 @@ void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType(

const bool allowed = (render_view_host != NULL &&

render_view_host->GetDelegate() != NULL &&

render_view_host->GetDelegate()->GetRenderViewType() ==

- content::VIEW_TYPE_WEB_CONTENTS);

+ chrome::VIEW_TYPE_TAB_CONTENTS);

BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,

base::Bind(callback, session_id, allowed));

}