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

Unified Diff: ui/app_list/app_list_model.h

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 comment, add service dependency 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/app_list/start_page_service_factory.cc ('k') | ui/app_list/app_list_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_model.h
diff --git a/ui/app_list/app_list_model.h b/ui/app_list/app_list_model.h
index edaf20e7366d594162c82ab0d93f3b4fb7c691a6..56e349c4bbe86048a7f6755900047ffc95937e6d 100644
--- a/ui/app_list/app_list_model.h
+++ b/ui/app_list/app_list_model.h
@@ -131,7 +131,9 @@ class APP_LIST_EXPORT AppListModel : public AppListItemListObserver {
// Sets whether or not the custom launcher page should be enabled.
void SetCustomLauncherPageEnabled(bool enabled);
- bool custom_launcher_page_enabled() { return custom_launcher_page_enabled_; }
+ bool custom_launcher_page_enabled() const {
+ return custom_launcher_page_enabled_;
+ }
// Pushes a custom launcher page's subpage into the state stack in the model.
void PushCustomLauncherPageSubpage();
@@ -147,6 +149,9 @@ class APP_LIST_EXPORT AppListModel : public AppListItemListObserver {
return custom_launcher_page_subpage_depth_;
}
+ void SetSearchEngineIsGoogle(bool is_google);
+ bool search_engine_is_google() const { return search_engine_is_google_; }
+
// Filters the given |results| by |display_type|. The returned list is
// truncated to |max_results|.
static std::vector<SearchResult*> FilterSearchResultsByDisplayType(
@@ -203,6 +208,7 @@ class APP_LIST_EXPORT AppListModel : public AppListItemListObserver {
ObserverList<AppListModelObserver, true> observers_;
bool folders_enabled_;
bool custom_launcher_page_enabled_;
+ bool search_engine_is_google_;
// The current number of subpages the custom launcher page has pushed.
int custom_launcher_page_subpage_depth_;
« no previous file with comments | « chrome/browser/ui/app_list/start_page_service_factory.cc ('k') | ui/app_list/app_list_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698