Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: chrome/browser/ui/app_list/app_list_service_mac.mm

Issue 15675008: Add enable-app-launcher-shim to chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move grd to before <!-- Crashes --> Created 7 years, 7 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/common/chrome_switches.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/app_list_service_mac.mm
diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm
index 3a45759192ba84773b076c36e05fb26061f19826..15a2cf27821771a45663160fe6bd2c586456ccb7 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac.mm
+++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
@@ -140,8 +140,8 @@ void CreateAppListShim(const base::FilePath& profile_path) {
// If disabling with --enable-app-list-shim=0, and there is one, delete it.
void CheckAppListShimOnFileThread(const base::FilePath& profile_path) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
- const bool enable = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kEnableAppListShim).c_str()[0] != '0';
+ const bool enable =
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppListShim);
base::FilePath install_path = web_app::GetAppInstallPath(
GetAppListShortcutInfo(profile_path));
if (enable == file_util::PathExists(install_path))
@@ -214,8 +214,7 @@ void AppListServiceMac::Init(Profile* initial_profile) {
// a profile has not yet been determined so |initial_profile| will be NULL.
if (initial_profile) {
static bool checked_shim = false;
- if (!checked_shim && CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableAppListShim)) {
+ if (!checked_shim) {
checked_shim = true;
content::BrowserThread::PostTask(
content::BrowserThread::FILE, FROM_HERE,
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/common/chrome_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698