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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 1747773002: Make the ENABLE_APP_LIST build flag work on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2016 header Created 4 years, 9 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 #if BUILDFLAG(ANDROID_JAVA_UI) 499 #if BUILDFLAG(ANDROID_JAVA_UI)
500 variations::VariationsService::RegisterProfilePrefs(registry); 500 variations::VariationsService::RegisterProfilePrefs(registry);
501 MostVisitedSites::RegisterProfilePrefs(registry); 501 MostVisitedSites::RegisterProfilePrefs(registry);
502 NewTabPagePrefs::RegisterProfilePrefs(registry); 502 NewTabPagePrefs::RegisterProfilePrefs(registry);
503 PartnerBookmarksShim::RegisterProfilePrefs(registry); 503 PartnerBookmarksShim::RegisterProfilePrefs(registry);
504 PopularSites::RegisterProfilePrefs(registry); 504 PopularSites::RegisterProfilePrefs(registry);
505 #else 505 #else
506 AppShortcutManager::RegisterProfilePrefs(registry); 506 AppShortcutManager::RegisterProfilePrefs(registry);
507 DeviceIDFetcher::RegisterProfilePrefs(registry); 507 DeviceIDFetcher::RegisterProfilePrefs(registry);
508 DevToolsWindow::RegisterProfilePrefs(registry); 508 DevToolsWindow::RegisterProfilePrefs(registry);
509 #if defined(ENABLE_APP_LIST)
509 DriveAppMapping::RegisterProfilePrefs(registry); 510 DriveAppMapping::RegisterProfilePrefs(registry);
511 #endif
510 extensions::CommandService::RegisterProfilePrefs(registry); 512 extensions::CommandService::RegisterProfilePrefs(registry);
511 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 513 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
512 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 514 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
513 first_run::RegisterProfilePrefs(registry); 515 first_run::RegisterProfilePrefs(registry);
514 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); 516 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
515 NewTabUI::RegisterProfilePrefs(registry); 517 NewTabUI::RegisterProfilePrefs(registry);
516 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 518 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
517 PinnedTabCodec::RegisterProfilePrefs(registry); 519 PinnedTabCodec::RegisterProfilePrefs(registry);
518 signin::RegisterProfilePrefs(registry); 520 signin::RegisterProfilePrefs(registry);
519 #endif 521 #endif
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete); 646 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete);
645 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart); 647 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart);
646 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad); 648 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad);
647 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart); 649 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart);
648 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold); 650 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold);
649 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); 651 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold);
650 #endif // defined(USE_AURA) 652 #endif // defined(USE_AURA)
651 } 653 }
652 654
653 } // namespace chrome 655 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/BUILD.gn » ('j') | chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698