chrome/browser/ui/app_list/start_page_service.cc - Issue 186483004: Add a skeleton Start Page to the experimental app list.

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/app_list/start_page_service.cc

Issue 186483004: Add a skeleton Start Page to the experimental app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ares_change_experimental_animation

Patch Set: rework Created 6 years, 9 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

« chrome/browser/about_flags.cc ('K') | « chrome/browser/resources/app_list/start_page.html ('k') | chrome/browser/ui/app_list/start_page_service_factory.cc » ('j') | chrome/browser/ui/app_list/start_page_service_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/start_page_service.cc

diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc

index 641c66ba8673ce979e3f22ab2c38b77a2dfae87d..2f5b743c0917237707b4b887e0767afbd11aed69 100644

--- a/chrome/browser/ui/app_list/start_page_service.cc

+++ b/chrome/browser/ui/app_list/start_page_service.cc

@@ -145,8 +145,14 @@ void StartPageService::ToggleSpeechRecognition() {

}

content::WebContents* StartPageService::GetStartPageContents() {

- return CommandLine::ForCurrentProcess()->HasSwitch(

- ::switches::kShowAppListStartPage) ? contents_.get() : NULL;

+ return (app_list::switches::IsExperimentalAppListEnabled() ||

+ app_list::switches::IsExperimentalAppListEnabled())

xiyuan 2014/03/14 17:00:54 A || A is strange. We should just keep one.

calamity 2014/05/07 06:11:52 Done.

+ ? contents_.get()

+ : NULL;

+content::WebContents* StartPageService::GetSpeechRecognitionContents() {

+ return app_list::switches::IsVoiceSearchEnabled() ? contents_.get() : NULL;

}

content::WebContents* StartPageService::GetSpeechRecognitionContents() {

xiyuan 2014/03/14 17:00:54 Unintended copy-n-paste?

calamity 2014/05/07 06:11:52 Done.