| 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 2084 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2095 PrefService::SYNCABLE_PREF); | 2095 PrefService::SYNCABLE_PREF); |
| 2096 prefs->RegisterBooleanPref(prefs::kDeleteCookies, | 2096 prefs->RegisterBooleanPref(prefs::kDeleteCookies, |
| 2097 true, | 2097 true, |
| 2098 PrefService::SYNCABLE_PREF); | 2098 PrefService::SYNCABLE_PREF); |
| 2099 prefs->RegisterBooleanPref(prefs::kDeletePasswords, | 2099 prefs->RegisterBooleanPref(prefs::kDeletePasswords, |
| 2100 false, | 2100 false, |
| 2101 PrefService::SYNCABLE_PREF); | 2101 PrefService::SYNCABLE_PREF); |
| 2102 prefs->RegisterBooleanPref(prefs::kDeleteFormData, | 2102 prefs->RegisterBooleanPref(prefs::kDeleteFormData, |
| 2103 false, | 2103 false, |
| 2104 PrefService::SYNCABLE_PREF); | 2104 PrefService::SYNCABLE_PREF); |
| 2105 prefs->RegisterBooleanPref(prefs::kDeleteHostedAppsData, |
| 2106 false, |
| 2107 PrefService::SYNCABLE_PREF); |
| 2105 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, | 2108 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, |
| 2106 0, | 2109 0, |
| 2107 PrefService::SYNCABLE_PREF); | 2110 PrefService::SYNCABLE_PREF); |
| 2108 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, | 2111 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, |
| 2109 true, | 2112 true, |
| 2110 PrefService::UNSYNCABLE_PREF); | 2113 PrefService::UNSYNCABLE_PREF); |
| 2111 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, | 2114 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, |
| 2112 true, | 2115 true, |
| 2113 PrefService::UNSYNCABLE_PREF); | 2116 PrefService::UNSYNCABLE_PREF); |
| 2114 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, | 2117 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, |
| (...skipping 3032 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5147 if (contents && !allow_js_access) { | 5150 if (contents && !allow_js_access) { |
| 5148 contents->web_contents()->GetController().LoadURL( | 5151 contents->web_contents()->GetController().LoadURL( |
| 5149 target_url, | 5152 target_url, |
| 5150 content::Referrer(), | 5153 content::Referrer(), |
| 5151 content::PAGE_TRANSITION_LINK, | 5154 content::PAGE_TRANSITION_LINK, |
| 5152 std::string()); // No extra headers. | 5155 std::string()); // No extra headers. |
| 5153 } | 5156 } |
| 5154 | 5157 |
| 5155 return contents != NULL; | 5158 return contents != NULL; |
| 5156 } | 5159 } |
| OLD | NEW |