diff options
| author | scottmg <scottmg@chromium.org> | 2016-03-15 17:36:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-16 00:37:32 +0000 |
| commit | 930c8aff1499991bd8a4ee7e513f39070cabded6 (patch) | |
| tree | edd835b1add0f783d2fde29f1c84a9cf1d98da8f | |
| parent | 89fa440fdd71e96da75a9570d99acb25b63be812 (diff) | |
| download | chromium_src-930c8aff1499991bd8a4ee7e513f39070cabded6.zip chromium_src-930c8aff1499991bd8a4ee7e513f39070cabded6.tar.gz chromium_src-930c8aff1499991bd8a4ee7e513f39070cabded6.tar.bz2 | |
Remove HostDesktopType from app_list_view_delegate
TBR=tapted@chromium.org
BUG=558054
Review URL: https://codereview.chromium.org/1806793002
Cr-Commit-Position: refs/heads/master@{#381368}
| -rw-r--r-- | chrome/browser/ui/app_list/app_list_view_delegate.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc index 65c4b69..86e85c5 100644 --- a/chrome/browser/ui/app_list/app_list_view_delegate.cc +++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc @@ -36,7 +36,6 @@ #include "chrome/browser/ui/apps/chrome_app_delegate.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" -#include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" @@ -325,11 +324,10 @@ void AppListViewDelegate::SetUpProfileSwitcher() { if (!profile_) return; +#if defined(USE_ASH) // Don't populate the app list users if we are on the ash desktop. - chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow( - controller_->GetAppListWindow()); - if (desktop == chrome::HOST_DESKTOP_TYPE_ASH) - return; + return; +#endif // USE_ASH // Populate the app list users. PopulateUsers(profile_->GetPath(), &users_); |