diff options
| author | calamity <calamity@chromium.org> | 2015-03-01 21:09:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-02 05:09:31 +0000 |
| commit | 7d3292e1f794939ba322524b3871280041e27c22 (patch) | |
| tree | 246565d967b5db50ffa34eeff701e0160f90b386 | |
| parent | 271831d98b783bf3df74f81b5073202adac18884 (diff) | |
| download | chromium_src-7d3292e1f794939ba322524b3871280041e27c22.zip chromium_src-7d3292e1f794939ba322524b3871280041e27c22.tar.gz chromium_src-7d3292e1f794939ba322524b3871280041e27c22.tar.bz2 | |
Fix custom launcher pages showing when setEnabled(false) is called.
This CL fixes an issue where the custom launcher page would still be
shown when the app list was opened even when setEnabled(false) was called.
BUG=462444
Review URL: https://codereview.chromium.org/958133005
Cr-Commit-Position: refs/heads/master@{#318650}
| -rw-r--r-- | ui/app_list/views/app_list_main_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc index df9f32b..dceae0f 100644 --- a/ui/app_list/views/app_list_main_view.cc +++ b/ui/app_list/views/app_list_main_view.cc @@ -271,7 +271,7 @@ void AppListMainView::OnCustomLauncherPageEnabledStateChanged(bool enabled) { if (!custom_page) return; - if (enabled) { + if (ShouldShowCustomLauncherPage()) { // Make the custom page view visible again. custom_page->SetVisible(true); } else if (contents_view_->IsStateActive( |