chrome/browser/ui/app_list/app_list_util.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/app_list/app_list_util.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/app_list/app_list_util.h"	5 #include "chrome/browser/ui/app_list/app_list_util.h"

6	6

7 #include "base/prefs/pref_service.h"

8 #include "build/build_config.h"	7 #include "build/build_config.h"

9 #include "chrome/browser/browser_process.h"	8 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/ui/host_desktop.h"	9 #include "chrome/browser/ui/host_desktop.h"

11 #include "chrome/common/pref_names.h"	10 #include "chrome/common/pref_names.h"

	11 #include "components/prefs/pref_service.h"

12	12

13 bool IsAppLauncherEnabled() {	13 bool IsAppLauncherEnabled() {

14 #if !defined(ENABLE_APP_LIST)	14 #if !defined(ENABLE_APP_LIST)

15 return false;	15 return false;

16	16

17 #elif defined(OS_CHROMEOS)	17 #elif defined(OS_CHROMEOS)

18 return true;	18 return true;

19	19

20 #else // defined(ENABLE_APP_LIST) && !defined(OS_CHROMEOS)	20 #else // defined(ENABLE_APP_LIST) && !defined(OS_CHROMEOS)

21 if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)	21 if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)

(...skipping 10 matching lines...) Expand all Loading...
32 PrefService* local_state = g_browser_process->local_state();	32 PrefService* local_state = g_browser_process->local_state();

33 // In some tests, the prefs aren't initialised.	33 // In some tests, the prefs aren't initialised.

34 if (!local_state)	34 if (!local_state)

35 return false;	35 return false;

36 return !IsAppLauncherEnabled() &&	36 return !IsAppLauncherEnabled() &&

37 local_state->GetBoolean(prefs::kShowAppLauncherPromo);	37 local_state->GetBoolean(prefs::kShowAppLauncherPromo);

38 #else	38 #else

39 return false;	39 return false;

40 #endif	40 #endif

41 } // namespace apps	41 } // namespace apps

OLD	NEW