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

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

Issue 2055553004: arc: Support pinned apps across Arc-enabled and Arc-disabled platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: chrome_mash_shelf_controller.cc update due namespace renaming Created 4 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 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 component_updater::RegisterProfilePrefsForSwReporter(registry); 565 component_updater::RegisterProfilePrefsForSwReporter(registry);
566 NetworkProfileBubble::RegisterProfilePrefs(registry); 566 NetworkProfileBubble::RegisterProfilePrefs(registry);
567 #endif 567 #endif
568 568
569 #if defined(TOOLKIT_VIEWS) 569 #if defined(TOOLKIT_VIEWS)
570 RegisterBrowserViewProfilePrefs(registry); 570 RegisterBrowserViewProfilePrefs(registry);
571 RegisterInvertBubbleUserPrefs(registry); 571 RegisterInvertBubbleUserPrefs(registry);
572 #endif 572 #endif
573 573
574 #if defined(USE_ASH) 574 #if defined(USE_ASH)
575 ash::RegisterChromeLauncherUserPrefs(registry); 575 ash::launcher::RegisterChromeLauncherUserPrefs(registry);
576 #endif 576 #endif
577 577
578 #if !defined(OS_ANDROID) 578 #if !defined(OS_ANDROID)
579 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); 579 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
580 #endif 580 #endif
581 581
582 // Preferences registered only for migration (clearing or moving to a new key) 582 // Preferences registered only for migration (clearing or moving to a new key)
583 // go here. 583 // go here.
584 584
585 #if defined(OS_WIN) 585 #if defined(OS_WIN)
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, 705 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined,
706 install_time.ToInternalValue()); 706 install_time.ToInternalValue());
707 } 707 }
708 profile_prefs->ClearPref(kCheckDefaultBrowser); 708 profile_prefs->ClearPref(kCheckDefaultBrowser);
709 709
710 // Added 5/2016. 710 // Added 5/2016.
711 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); 711 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref);
712 } 712 }
713 713
714 } // namespace chrome 714 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698