Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 7390027: Added group policies to enable/disable importing of data from other browsers. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed issues pointed out by Mattias Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 2225 matching lines...) Expand 10 before | Expand all | Expand 10 after
2236 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, 2236 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled,
2237 true, 2237 true,
2238 PrefService::UNSYNCABLE_PREF); 2238 PrefService::UNSYNCABLE_PREF);
2239 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, 2239 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation,
2240 -1, 2240 -1,
2241 PrefService::UNSYNCABLE_PREF); 2241 PrefService::UNSYNCABLE_PREF);
2242 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, 2242 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement,
2243 PrefService::UNSYNCABLE_PREF); 2243 PrefService::UNSYNCABLE_PREF);
2244 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, 2244 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement,
2245 PrefService::UNSYNCABLE_PREF); 2245 PrefService::UNSYNCABLE_PREF);
2246 prefs->RegisterBooleanPref(prefs::kImportBookmarks,
2247 true,
2248 PrefService::UNSYNCABLE_PREF);
2249 prefs->RegisterBooleanPref(prefs::kImportHistory,
2250 true,
2251 PrefService::UNSYNCABLE_PREF);
2252 prefs->RegisterBooleanPref(prefs::kImportHomepage,
2253 true,
2254 PrefService::UNSYNCABLE_PREF);
2255 prefs->RegisterBooleanPref(prefs::kImportSearchEngine,
2256 true,
2257 PrefService::UNSYNCABLE_PREF);
2258 prefs->RegisterBooleanPref(prefs::kImportSavedPasswords,
2259 true,
2260 PrefService::UNSYNCABLE_PREF);
2261
2246 // We need to register the type of these preferences in order to query 2262 // We need to register the type of these preferences in order to query
2247 // them even though they're only typically controlled via policy. 2263 // them even though they're only typically controlled via policy.
2248 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, 2264 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs,
2249 false, 2265 false,
2250 PrefService::UNSYNCABLE_PREF); 2266 PrefService::UNSYNCABLE_PREF);
2251 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, 2267 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated,
2252 false, 2268 false,
2253 PrefService::UNSYNCABLE_PREF); 2269 PrefService::UNSYNCABLE_PREF);
2254 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, 2270 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize,
2255 false, 2271 false,
(...skipping 2526 matching lines...) Expand 10 before | Expand all | Expand 10 after
4782 window_->BookmarkBarStateChanged(animate_type); 4798 window_->BookmarkBarStateChanged(animate_type);
4783 } 4799 }
4784 4800
4785 void Browser::ShowSyncSetup() { 4801 void Browser::ShowSyncSetup() {
4786 ProfileSyncService* service = profile()->GetProfileSyncService(); 4802 ProfileSyncService* service = profile()->GetProfileSyncService();
4787 if (service->HasSyncSetupCompleted()) 4803 if (service->HasSyncSetupCompleted())
4788 ShowOptionsTab(chrome::kSyncSetupSubPage); 4804 ShowOptionsTab(chrome::kSyncSetupSubPage);
4789 else 4805 else
4790 profile()->GetProfileSyncService()->ShowLoginDialog(); 4806 profile()->GetProfileSyncService()->ShowLoginDialog();
4791 } 4807 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698