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

Side by Side Diff: ui/app_list/views/start_page_view.cc

Issue 907833002: Hide experimental app list Google logo and custom launcher page when search engine is not Google. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@update_app_list_bg_color
Patch Set: address comments, disable animation to hidden views Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/app_list/views/start_page_view.h" 5 #include "ui/app_list/views/start_page_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/app_list/app_list_constants.h" 8 #include "ui/app_list/app_list_constants.h"
9 #include "ui/app_list/app_list_item.h" 9 #include "ui/app_list/app_list_item.h"
10 #include "ui/app_list/app_list_model.h" 10 #include "ui/app_list/app_list_model.h"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 } 310 }
311 311
312 void StartPageView::UpdateCustomPageClickzoneVisibility() { 312 void StartPageView::UpdateCustomPageClickzoneVisibility() {
313 // This can get called before InitWidgets(), so we cannot guarantee that 313 // This can get called before InitWidgets(), so we cannot guarantee that
314 // custom_page_clickzone_ will not be null. 314 // custom_page_clickzone_ will not be null.
315 views::Widget* custom_page_clickzone = 315 views::Widget* custom_page_clickzone =
316 app_list_main_view_->GetCustomPageClickzone(); 316 app_list_main_view_->GetCustomPageClickzone();
317 if (!custom_page_clickzone) 317 if (!custom_page_clickzone)
318 return; 318 return;
319 319
320 if (app_list_main_view_->contents_view()->ShouldShowCustomPageClickzone()) { 320 if (app_list_main_view_->ShouldShowCustomLauncherPage() &&
321 app_list_main_view_->contents_view()->IsStateActive(
322 AppListModel::STATE_START)) {
321 custom_page_clickzone->ShowInactive(); 323 custom_page_clickzone->ShowInactive();
322 return; 324 return;
323 } 325 }
324 326
325 custom_page_clickzone->Hide(); 327 custom_page_clickzone->Hide();
326 } 328 }
327 329
328 TileItemView* StartPageView::GetTileItemView(size_t index) { 330 TileItemView* StartPageView::GetTileItemView(size_t index) {
329 return tiles_container_->GetTileItemView(index); 331 return tiles_container_->GetTileItemView(index);
330 } 332 }
331 333
332 } // namespace app_list 334 } // namespace app_list
OLDNEW
« chrome/browser/ui/app_list/start_page_service.cc ('K') | « ui/app_list/views/start_page_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698