| 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 2052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2063 PrefService::SYNCABLE_PREF); | 2063 PrefService::SYNCABLE_PREF); |
| 2064 prefs->RegisterBooleanPref(prefs::kDeleteHostedAppsData, | 2064 prefs->RegisterBooleanPref(prefs::kDeleteHostedAppsData, |
| 2065 false, | 2065 false, |
| 2066 PrefService::SYNCABLE_PREF); | 2066 PrefService::SYNCABLE_PREF); |
| 2067 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, | 2067 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, |
| 2068 0, | 2068 0, |
| 2069 PrefService::SYNCABLE_PREF); | 2069 PrefService::SYNCABLE_PREF); |
| 2070 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, | 2070 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, |
| 2071 true, | 2071 true, |
| 2072 PrefService::UNSYNCABLE_PREF); | 2072 PrefService::UNSYNCABLE_PREF); |
| 2073 prefs->RegisterBooleanPref(prefs::kDefaultBrowserFlowDialog, |
| 2074 true, |
| 2075 PrefService::UNSYNCABLE_PREF); |
| 2073 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, | 2076 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, |
| 2074 true, | 2077 true, |
| 2075 PrefService::UNSYNCABLE_PREF); | 2078 PrefService::UNSYNCABLE_PREF); |
| 2076 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, | 2079 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, |
| 2077 true, | 2080 true, |
| 2078 PrefService::UNSYNCABLE_PREF); | 2081 PrefService::UNSYNCABLE_PREF); |
| 2079 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, | 2082 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, |
| 2080 true, | 2083 true, |
| 2081 PrefService::UNSYNCABLE_PREF); | 2084 PrefService::UNSYNCABLE_PREF); |
| 2082 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, | 2085 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, |
| (...skipping 3077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5160 if (contents && !allow_js_access) { | 5163 if (contents && !allow_js_access) { |
| 5161 contents->web_contents()->GetController().LoadURL( | 5164 contents->web_contents()->GetController().LoadURL( |
| 5162 target_url, | 5165 target_url, |
| 5163 content::Referrer(), | 5166 content::Referrer(), |
| 5164 content::PAGE_TRANSITION_LINK, | 5167 content::PAGE_TRANSITION_LINK, |
| 5165 std::string()); // No extra headers. | 5168 std::string()); // No extra headers. |
| 5166 } | 5169 } |
| 5167 | 5170 |
| 5168 return contents != NULL; | 5171 return contents != NULL; |
| 5169 } | 5172 } |
| OLD | NEW |