chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc - Issue 23618036: Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

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 23618036: Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_process_manager.cc ('k') | chrome/browser/task_manager/tab_contents_resource_provider.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 101297547eafe91bce6b6d6236e9b9ebdccd0c77..e2d991f936cbc1045f5ce9978af23389f17cf9f2 100644

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

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

@@ -160,7 +160,7 @@ class ChromeSpeechRecognitionManagerDelegate::TabWatcher

registrar_.reset(new content::NotificationRegistrar());

registrar_->Add(this,

- content::NOTIFICATION_WEB_CONTENTS_SWAPPED,

+ content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,

content::Source<WebContents>(web_contents));

registrar_->Add(this,

content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,

@@ -173,7 +173,7 @@ class ChromeSpeechRecognitionManagerDelegate::TabWatcher

const content::NotificationDetails& details) OVERRIDE {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

DCHECK(type == content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED ||

- type == content::NOTIFICATION_WEB_CONTENTS_SWAPPED);

+ type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED);

WebContents* web_contents = content::Source<WebContents>(source).ptr();

std::vector<WebContentsInfo>::iterator iter = FindWebContents(web_contents);

@@ -183,7 +183,7 @@ class ChromeSpeechRecognitionManagerDelegate::TabWatcher

registered_web_contents_.erase(iter);

registrar_->Remove(this,

- content::NOTIFICATION_WEB_CONTENTS_SWAPPED,

+ content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,

content::Source<WebContents>(web_contents));

registrar_->Remove(this,

content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,