chrome/browser/ui/ash/ash_init.cc - Issue 643103003: Use app_list_service_disabled in Athena

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/ash/ash_init.cc

Issue 643103003: Use app_list_service_disabled in Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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:

Index: chrome/browser/ui/ash/ash_init.cc

diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc

index 78e617b9c0ad23c98f3f79c145c76260ff6e4473..2722dd8a8104d1492387cf3a0e95418d58db3320 100644

--- a/chrome/browser/ui/ash/ash_init.cc

+++ b/chrome/browser/ui/ash/ash_init.cc

@@ -36,14 +36,6 @@

namespace chrome {

-bool ShouldOpenAshOnStartup() {

-#if defined(OS_CHROMEOS)

- return true;

-#endif

- // TODO(scottmg): http://crbug.com/133312, will need this for Win8 too.

- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh);

void OpenAsh(gfx::AcceleratedWidget remote_window) {

#if defined(OS_CHROMEOS)

#if defined(USE_X11)

« no previous file with comments | « chrome/browser/ui/ash/ash_init.h ('k') | chrome/browser/ui/ash/ash_util.h » ('j') | no next file with comments »