chrome/browser/chromeos/ui/app_launch_view.cc - Issue 18179004: Dismiss action in tab modal dialogs.

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/chromeos/ui/app_launch_view.cc

Issue 18179004: Dismiss action in tab modal dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test for Mac Created 7 years, 5 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:

Index: chrome/browser/chromeos/ui/app_launch_view.cc

diff --git a/chrome/browser/chromeos/ui/app_launch_view.cc b/chrome/browser/chromeos/ui/app_launch_view.cc

index f5354f3c71e3a1ffb3412b97725dd1546c4325b4..9b8da567fce331571620521948a22137b08ee9b7 100644

--- a/chrome/browser/chromeos/ui/app_launch_view.cc

+++ b/chrome/browser/chromeos/ui/app_launch_view.cc

@@ -78,7 +78,7 @@ void AppLaunchView::UpdateAppLaunchState(AppLaunchState state) {

// static

void AppLaunchView::CloseAppLaunchSplashScreen() {

if (g_instance) {

- g_instance->Close();

+ g_instance->GetWidget()->Close();

g_instance = NULL;

}

@@ -120,11 +120,6 @@ void AppLaunchView::Show() {

ShowWindow();

}

-void AppLaunchView::Close() {

- DCHECK(GetWidget());

- GetWidget()->Close();

void AppLaunchView::AddChildWebContents() {

content::BrowserContext* context =

ash::Shell::GetInstance()->delegate()->GetCurrentBrowserContext();