| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 1834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1845 PrefService::SYNCABLE_PREF); | 1845 PrefService::SYNCABLE_PREF); |
| 1846 prefs->RegisterBooleanPref(prefs::kDeleteHostedAppsData, | 1846 prefs->RegisterBooleanPref(prefs::kDeleteHostedAppsData, |
| 1847 false, | 1847 false, |
| 1848 PrefService::SYNCABLE_PREF); | 1848 PrefService::SYNCABLE_PREF); |
| 1849 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, | 1849 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, |
| 1850 0, | 1850 0, |
| 1851 PrefService::SYNCABLE_PREF); | 1851 PrefService::SYNCABLE_PREF); |
| 1852 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, | 1852 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, |
| 1853 true, | 1853 true, |
| 1854 PrefService::UNSYNCABLE_PREF); | 1854 PrefService::UNSYNCABLE_PREF); |
| 1855 prefs->RegisterBooleanPref(prefs::kDefaultBrowserFlowDialog, |
| 1856 true, |
| 1857 PrefService::UNSYNCABLE_PREF); |
| 1855 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, | 1858 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, |
| 1856 true, | 1859 true, |
| 1857 PrefService::UNSYNCABLE_PREF); | 1860 PrefService::UNSYNCABLE_PREF); |
| 1858 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, | 1861 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, |
| 1859 true, | 1862 true, |
| 1860 PrefService::UNSYNCABLE_PREF); | 1863 PrefService::UNSYNCABLE_PREF); |
| 1861 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, | 1864 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, |
| 1862 true, | 1865 true, |
| 1863 PrefService::UNSYNCABLE_PREF); | 1866 PrefService::UNSYNCABLE_PREF); |
| 1864 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, | 1867 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, |
| (...skipping 3076 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4941 if (contents && !allow_js_access) { | 4944 if (contents && !allow_js_access) { |
| 4942 contents->web_contents()->GetController().LoadURL( | 4945 contents->web_contents()->GetController().LoadURL( |
| 4943 target_url, | 4946 target_url, |
| 4944 content::Referrer(), | 4947 content::Referrer(), |
| 4945 content::PAGE_TRANSITION_LINK, | 4948 content::PAGE_TRANSITION_LINK, |
| 4946 std::string()); // No extra headers. | 4949 std::string()); // No extra headers. |
| 4947 } | 4950 } |
| 4948 | 4951 |
| 4949 return contents != NULL; | 4952 return contents != NULL; |
| 4950 } | 4953 } |
| OLD | NEW |