chrome/browser/ui/web_applications/web_app_ui.cc - Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

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/ui/web_applications/web_app_ui.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years 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/ui/views/tab_contents/tab_contents_container.cc ('k') | chrome/browser/ui/webui/active_downloads_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/web_applications/web_app_ui.cc

diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc

index 5d08a2f9f3c78d3edf1d9ca96d0fc6d3e2db0a4a..225fd85c58edbfec33af4a8aad6d35c61be3b849 100644

--- a/chrome/browser/ui/web_applications/web_app_ui.cc

+++ b/chrome/browser/ui/web_applications/web_app_ui.cc

@@ -104,7 +104,7 @@ UpdateShortcutWorker::UpdateShortcutWorker(TabContentsWrapper* tab_contents)

this,

content::NOTIFICATION_TAB_CLOSING,

content::Source<NavigationController>(

- &tab_contents_->tab_contents()->GetController()));

+ &tab_contents_->tab_contents()->controller()));

}

void UpdateShortcutWorker::Run() {

@@ -118,7 +118,7 @@ void UpdateShortcutWorker::Observe(

const content::NotificationDetails& details) {

if (type == content::NOTIFICATION_TAB_CLOSING &&

content::Source<NavigationController>(source).ptr() ==

- &tab_contents_->tab_contents()->GetController()) {

+ &tab_contents_->tab_contents()->controller()) {

// Underlying tab is closing.

tab_contents_ = NULL;

}

« no previous file with comments | « chrome/browser/ui/views/tab_contents/tab_contents_container.cc ('k') | chrome/browser/ui/webui/active_downloads_ui.cc » ('j') | no next file with comments »