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

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

Issue 2944973002: Remove IS_IOS checks in chrome/ (Closed)
Patch Set: Created 3 years, 6 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 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 #endif 263 #endif
264 264
265 #if defined(TOOLKIT_VIEWS) 265 #if defined(TOOLKIT_VIEWS)
266 #include "chrome/browser/ui/browser_view_prefs.h" 266 #include "chrome/browser/ui/browser_view_prefs.h"
267 #endif 267 #endif
268 268
269 #if defined(USE_ASH) 269 #if defined(USE_ASH)
270 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 270 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
271 #endif 271 #endif
272 272
273 #if !defined(OS_ANDROID) && !defined(OS_IOS) 273 #if !defined(OS_ANDROID)
274 #include "chrome/browser/ui/webui/md_history_ui.h" 274 #include "chrome/browser/ui/webui/md_history_ui.h"
275 #include "chrome/browser/ui/webui/settings/md_settings_ui.h" 275 #include "chrome/browser/ui/webui/settings/md_settings_ui.h"
276 #endif 276 #endif
277 277
278 namespace { 278 namespace {
279 279
280 // Deprecated 8/2016. 280 // Deprecated 8/2016.
281 constexpr char kRecentlySelectedEncoding[] = 281 constexpr char kRecentlySelectedEncoding[] =
282 "profile.recently_selected_encodings"; 282 "profile.recently_selected_encodings";
283 constexpr char kStaticEncodings[] = "intl.static_encodings"; 283 constexpr char kStaticEncodings[] = "intl.static_encodings";
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 616
617 #if defined(TOOLKIT_VIEWS) 617 #if defined(TOOLKIT_VIEWS)
618 RegisterBrowserViewProfilePrefs(registry); 618 RegisterBrowserViewProfilePrefs(registry);
619 RegisterInvertBubbleUserPrefs(registry); 619 RegisterInvertBubbleUserPrefs(registry);
620 #endif 620 #endif
621 621
622 #if defined(USE_ASH) 622 #if defined(USE_ASH)
623 RegisterChromeLauncherUserPrefs(registry); 623 RegisterChromeLauncherUserPrefs(registry);
624 #endif 624 #endif
625 625
626 #if !defined(OS_ANDROID) && !defined(OS_IOS) 626 #if !defined(OS_ANDROID)
627 MdHistoryUI::RegisterProfilePrefs(registry); 627 MdHistoryUI::RegisterProfilePrefs(registry);
628 settings::MdSettingsUI::RegisterProfilePrefs(registry); 628 settings::MdSettingsUI::RegisterProfilePrefs(registry);
629 #endif 629 #endif
630 630
631 // Preferences registered only for migration (clearing or moving to a new key) 631 // Preferences registered only for migration (clearing or moving to a new key)
632 // go here. 632 // go here.
633 633
634 registry->RegisterStringPref(kStaticEncodings, std::string()); 634 registry->RegisterStringPref(kStaticEncodings, std::string());
635 registry->RegisterStringPref(kRecentlySelectedEncoding, std::string()); 635 registry->RegisterStringPref(kRecentlySelectedEncoding, std::string());
636 registry->RegisterBooleanPref(kWebKitUsesUniversalDetector, true); 636 registry->RegisterBooleanPref(kWebKitUsesUniversalDetector, true);
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 // default values for all prefs locally. Since we already have the defaults it 747 // default values for all prefs locally. Since we already have the defaults it
748 // would be wasteful to request them from the service by connecting to the 748 // would be wasteful to request them from the service by connecting to the
749 // DEFAULT_STORE. 749 // DEFAULT_STORE.
750 // TODO(sammc): Once we have this distinction, connect to the default pref 750 // TODO(sammc): Once we have this distinction, connect to the default pref
751 // store here (by erasing it from |pref_stores|). 751 // store here (by erasing it from |pref_stores|).
752 pref_stores.erase(PrefValueStore::USER_STORE); 752 pref_stores.erase(PrefValueStore::USER_STORE);
753 return pref_stores; 753 return pref_stores;
754 } 754 }
755 755
756 } // namespace chrome 756 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/media/cast_remoting_connector.cc ('k') | chrome/browser/prefs/session_startup_pref.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698