Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 2172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2183 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, | 2183 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, |
| 2184 true, | 2184 true, |
| 2185 PrefService::UNSYNCABLE_PREF); | 2185 PrefService::UNSYNCABLE_PREF); |
| 2186 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, | 2186 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, |
| 2187 -1, | 2187 -1, |
| 2188 PrefService::UNSYNCABLE_PREF); | 2188 PrefService::UNSYNCABLE_PREF); |
| 2189 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, | 2189 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, |
| 2190 PrefService::UNSYNCABLE_PREF); | 2190 PrefService::UNSYNCABLE_PREF); |
| 2191 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, | 2191 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, |
| 2192 PrefService::UNSYNCABLE_PREF); | 2192 PrefService::UNSYNCABLE_PREF); |
| 2193 prefs->RegisterBooleanPref(prefs::kImportBookmarks, | |
| 2194 true, | |
| 2195 PrefService::UNSYNCABLE_PREF); | |
| 2196 prefs->RegisterBooleanPref(prefs::kImportHistory, | |
| 2197 true, | |
| 2198 PrefService::UNSYNCABLE_PREF); | |
| 2199 prefs->RegisterBooleanPref(prefs::kImportHomepage, | |
| 2200 true, | |
| 2201 PrefService::UNSYNCABLE_PREF); | |
| 2202 prefs->RegisterBooleanPref(prefs::kImportSearchEngine, | |
| 2203 true, | |
| 2204 PrefService::UNSYNCABLE_PREF); | |
| 2205 prefs->RegisterBooleanPref(prefs::kImportSavedPasswords, | |
| 2206 true, | |
| 2207 PrefService::UNSYNCABLE_PREF); | |
|
Mattias Nissler (ping if slow)
2011/07/18 15:02:30
blank line before comment.
| |
| 2193 // We need to register the type of these preferences in order to query | 2208 // We need to register the type of these preferences in order to query |
| 2194 // them even though they're only typically controlled via policy. | 2209 // them even though they're only typically controlled via policy. |
| 2195 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, | 2210 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, |
| 2196 false, | 2211 false, |
| 2197 PrefService::UNSYNCABLE_PREF); | 2212 PrefService::UNSYNCABLE_PREF); |
| 2198 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, | 2213 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, |
| 2199 false, | 2214 false, |
| 2200 PrefService::UNSYNCABLE_PREF); | 2215 PrefService::UNSYNCABLE_PREF); |
| 2201 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, | 2216 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, |
| 2202 false, | 2217 false, |
| (...skipping 2518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4721 // end up querying state once they process the tab switch. | 4736 // end up querying state once they process the tab switch. |
| 4722 return; | 4737 return; |
| 4723 } | 4738 } |
| 4724 | 4739 |
| 4725 BookmarkBar::AnimateChangeType animate_type = | 4740 BookmarkBar::AnimateChangeType animate_type = |
| 4726 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? | 4741 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? |
| 4727 BookmarkBar::ANIMATE_STATE_CHANGE : | 4742 BookmarkBar::ANIMATE_STATE_CHANGE : |
| 4728 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; | 4743 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; |
| 4729 window_->BookmarkBarStateChanged(animate_type); | 4744 window_->BookmarkBarStateChanged(animate_type); |
| 4730 } | 4745 } |
| OLD | NEW |