| 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 2102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2113 PrefService::SYNCABLE_PREF); | 2113 PrefService::SYNCABLE_PREF); |
| 2114 prefs->RegisterBooleanPref(prefs::kDeleteCookies, | 2114 prefs->RegisterBooleanPref(prefs::kDeleteCookies, |
| 2115 true, | 2115 true, |
| 2116 PrefService::SYNCABLE_PREF); | 2116 PrefService::SYNCABLE_PREF); |
| 2117 prefs->RegisterBooleanPref(prefs::kDeletePasswords, | 2117 prefs->RegisterBooleanPref(prefs::kDeletePasswords, |
| 2118 false, | 2118 false, |
| 2119 PrefService::SYNCABLE_PREF); | 2119 PrefService::SYNCABLE_PREF); |
| 2120 prefs->RegisterBooleanPref(prefs::kDeleteFormData, | 2120 prefs->RegisterBooleanPref(prefs::kDeleteFormData, |
| 2121 false, | 2121 false, |
| 2122 PrefService::SYNCABLE_PREF); | 2122 PrefService::SYNCABLE_PREF); |
| 2123 prefs->RegisterBooleanPref(prefs::kDeleteHostedAppsData, |
| 2124 false, |
| 2125 PrefService::SYNCABLE_PREF); |
| 2123 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, | 2126 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, |
| 2124 0, | 2127 0, |
| 2125 PrefService::SYNCABLE_PREF); | 2128 PrefService::SYNCABLE_PREF); |
| 2126 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, | 2129 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, |
| 2127 true, | 2130 true, |
| 2128 PrefService::UNSYNCABLE_PREF); | 2131 PrefService::UNSYNCABLE_PREF); |
| 2129 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, | 2132 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, |
| 2130 true, | 2133 true, |
| 2131 PrefService::UNSYNCABLE_PREF); | 2134 PrefService::UNSYNCABLE_PREF); |
| 2132 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, | 2135 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, |
| (...skipping 3039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5172 if (contents && !allow_js_access) { | 5175 if (contents && !allow_js_access) { |
| 5173 contents->web_contents()->GetController().LoadURL( | 5176 contents->web_contents()->GetController().LoadURL( |
| 5174 target_url, | 5177 target_url, |
| 5175 content::Referrer(), | 5178 content::Referrer(), |
| 5176 content::PAGE_TRANSITION_LINK, | 5179 content::PAGE_TRANSITION_LINK, |
| 5177 std::string()); // No extra headers. | 5180 std::string()); // No extra headers. |
| 5178 } | 5181 } |
| 5179 | 5182 |
| 5180 return contents != NULL; | 5183 return contents != NULL; |
| 5181 } | 5184 } |
| OLD | NEW |