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

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

Issue 2416133002: Implement local storage for App List in case app sync is off. (Closed)
Patch Set: added extra sync test and rebased Created 4 years, 2 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/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 #include "components/translate/core/browser/language_model.h" 102 #include "components/translate/core/browser/language_model.h"
103 #include "components/translate/core/browser/translate_prefs.h" 103 #include "components/translate/core/browser/translate_prefs.h"
104 #include "components/update_client/update_client.h" 104 #include "components/update_client/update_client.h"
105 #include "components/variations/service/variations_service.h" 105 #include "components/variations/service/variations_service.h"
106 #include "content/public/browser/browser_thread.h" 106 #include "content/public/browser/browser_thread.h"
107 #include "content/public/browser/render_process_host.h" 107 #include "content/public/browser/render_process_host.h"
108 #include "net/http/http_server_properties_manager.h" 108 #include "net/http/http_server_properties_manager.h"
109 109
110 #if BUILDFLAG(ENABLE_APP_LIST) 110 #if BUILDFLAG(ENABLE_APP_LIST)
111 #include "chrome/browser/apps/drive/drive_app_mapping.h" 111 #include "chrome/browser/apps/drive/drive_app_mapping.h"
112 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
112 #endif 113 #endif
113 114
114 #if BUILDFLAG(ENABLE_BACKGROUND) 115 #if BUILDFLAG(ENABLE_BACKGROUND)
115 #include "chrome/browser/background/background_mode_manager.h" 116 #include "chrome/browser/background/background_mode_manager.h"
116 #endif 117 #endif
117 118
118 #if defined(ENABLE_EXTENSIONS) 119 #if defined(ENABLE_EXTENSIONS)
119 #include "chrome/browser/accessibility/animation_policy_prefs.h" 120 #include "chrome/browser/accessibility/animation_policy_prefs.h"
120 #include "chrome/browser/apps/shortcut_manager.h" 121 #include "chrome/browser/apps/shortcut_manager.h"
121 #include "chrome/browser/extensions/activity_log/activity_log.h" 122 #include "chrome/browser/extensions/activity_log/activity_log.h"
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry); 558 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry);
558 ntp_tiles::PopularSites::RegisterProfilePrefs(registry); 559 ntp_tiles::PopularSites::RegisterProfilePrefs(registry);
559 NewTabPagePrefs::RegisterProfilePrefs(registry); 560 NewTabPagePrefs::RegisterProfilePrefs(registry);
560 PartnerBookmarksShim::RegisterProfilePrefs(registry); 561 PartnerBookmarksShim::RegisterProfilePrefs(registry);
561 #else 562 #else
562 AppShortcutManager::RegisterProfilePrefs(registry); 563 AppShortcutManager::RegisterProfilePrefs(registry);
563 DeviceIDFetcher::RegisterProfilePrefs(registry); 564 DeviceIDFetcher::RegisterProfilePrefs(registry);
564 DevToolsWindow::RegisterProfilePrefs(registry); 565 DevToolsWindow::RegisterProfilePrefs(registry);
565 #if BUILDFLAG(ENABLE_APP_LIST) 566 #if BUILDFLAG(ENABLE_APP_LIST)
566 DriveAppMapping::RegisterProfilePrefs(registry); 567 DriveAppMapping::RegisterProfilePrefs(registry);
568 app_list::AppListSyncableService::RegisterProfilePrefs(registry);
567 #endif 569 #endif
568 extensions::CommandService::RegisterProfilePrefs(registry); 570 extensions::CommandService::RegisterProfilePrefs(registry);
569 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 571 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
570 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 572 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
571 first_run::RegisterProfilePrefs(registry); 573 first_run::RegisterProfilePrefs(registry);
572 NewTabUI::RegisterProfilePrefs(registry); 574 NewTabUI::RegisterProfilePrefs(registry);
573 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 575 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
574 PinnedTabCodec::RegisterProfilePrefs(registry); 576 PinnedTabCodec::RegisterProfilePrefs(registry);
575 signin::RegisterProfilePrefs(registry); 577 signin::RegisterProfilePrefs(registry);
576 #endif 578 #endif
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 // Added 8/2016. 774 // Added 8/2016.
773 profile_prefs->ClearPref(kStaticEncodings); 775 profile_prefs->ClearPref(kStaticEncodings);
774 profile_prefs->ClearPref(kRecentlySelectedEncoding); 776 profile_prefs->ClearPref(kRecentlySelectedEncoding);
775 777
776 // Added 9/2016. 778 // Added 9/2016.
777 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 779 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
778 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 780 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
779 } 781 }
780 782
781 } // namespace chrome 783 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698