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" | 7 #include "base/prefs/pref_service.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/ui/host_desktop.h" | 9 #include "chrome/browser/ui/host_desktop.h" |
10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
| 11 #include "ui/gfx/host_desktop_type.h" |
11 | 12 |
12 bool IsAppLauncherEnabled() { | 13 bool IsAppLauncherEnabled() { |
13 #if !defined(ENABLE_APP_LIST) | 14 #if !defined(ENABLE_APP_LIST) |
14 return false; | 15 return false; |
15 | 16 |
16 #elif defined(OS_CHROMEOS) | 17 #elif defined(OS_CHROMEOS) |
17 return true; | 18 return true; |
18 | 19 |
19 #else // defined(ENABLE_APP_LIST) && !defined(OS_CHROMEOS) | 20 #else // defined(ENABLE_APP_LIST) && !defined(OS_CHROMEOS) |
20 if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH) | 21 if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH) |
(...skipping 10 matching lines...) Expand all Loading... |
31 PrefService* local_state = g_browser_process->local_state(); | 32 PrefService* local_state = g_browser_process->local_state(); |
32 // In some tests, the prefs aren't initialised. | 33 // In some tests, the prefs aren't initialised. |
33 if (!local_state) | 34 if (!local_state) |
34 return false; | 35 return false; |
35 return !IsAppLauncherEnabled() && | 36 return !IsAppLauncherEnabled() && |
36 local_state->GetBoolean(prefs::kShowAppLauncherPromo); | 37 local_state->GetBoolean(prefs::kShowAppLauncherPromo); |
37 #else | 38 #else |
38 return false; | 39 return false; |
39 #endif | 40 #endif |
40 } // namespace apps | 41 } // namespace apps |
OLD | NEW |