| 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 2118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2129 PrefService::SYNCABLE_PREF); | 2129 PrefService::SYNCABLE_PREF); |
| 2130 prefs->RegisterBooleanPref(prefs::kDeleteHostedAppsData, | 2130 prefs->RegisterBooleanPref(prefs::kDeleteHostedAppsData, |
| 2131 false, | 2131 false, |
| 2132 PrefService::SYNCABLE_PREF); | 2132 PrefService::SYNCABLE_PREF); |
| 2133 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, | 2133 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, |
| 2134 0, | 2134 0, |
| 2135 PrefService::SYNCABLE_PREF); | 2135 PrefService::SYNCABLE_PREF); |
| 2136 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, | 2136 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, |
| 2137 true, | 2137 true, |
| 2138 PrefService::UNSYNCABLE_PREF); | 2138 PrefService::UNSYNCABLE_PREF); |
| 2139 prefs->RegisterBooleanPref(prefs::kDefaultBrowserFlowDialog, |
| 2140 true, |
| 2141 PrefService::UNSYNCABLE_PREF); |
| 2139 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, | 2142 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, |
| 2140 true, | 2143 true, |
| 2141 PrefService::UNSYNCABLE_PREF); | 2144 PrefService::UNSYNCABLE_PREF); |
| 2142 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, | 2145 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, |
| 2143 true, | 2146 true, |
| 2144 PrefService::UNSYNCABLE_PREF); | 2147 PrefService::UNSYNCABLE_PREF); |
| 2145 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, | 2148 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, |
| 2146 true, | 2149 true, |
| 2147 PrefService::UNSYNCABLE_PREF); | 2150 PrefService::UNSYNCABLE_PREF); |
| 2148 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, | 2151 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, |
| (...skipping 3077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5226 if (contents && !allow_js_access) { | 5229 if (contents && !allow_js_access) { |
| 5227 contents->web_contents()->GetController().LoadURL( | 5230 contents->web_contents()->GetController().LoadURL( |
| 5228 target_url, | 5231 target_url, |
| 5229 content::Referrer(), | 5232 content::Referrer(), |
| 5230 content::PAGE_TRANSITION_LINK, | 5233 content::PAGE_TRANSITION_LINK, |
| 5231 std::string()); // No extra headers. | 5234 std::string()); // No extra headers. |
| 5232 } | 5235 } |
| 5233 | 5236 |
| 5234 return contents != NULL; | 5237 return contents != NULL; |
| 5235 } | 5238 } |
| OLD | NEW |