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

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

Issue 7714038: Reverts debugging code added in hopes of tracking crash. This also (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 2255 matching lines...) Expand 10 before | Expand all | Expand 10 after
2266 true, 2266 true,
2267 PrefService::UNSYNCABLE_PREF); 2267 PrefService::UNSYNCABLE_PREF);
2268 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, 2268 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled,
2269 false, 2269 false,
2270 PrefService::UNSYNCABLE_PREF); 2270 PrefService::UNSYNCABLE_PREF);
2271 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, 2271 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation,
2272 -1, 2272 -1,
2273 PrefService::UNSYNCABLE_PREF); 2273 PrefService::UNSYNCABLE_PREF);
2274 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, 2274 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement,
2275 PrefService::UNSYNCABLE_PREF); 2275 PrefService::UNSYNCABLE_PREF);
2276 // TODO(sky): remove this. It's used in tracking 91396.
2277 #if defined(OS_WIN)
2278 prefs->CheckIfValueDestroyed(prefs::kBrowserWindowPlacement,
2279 base::Value::TYPE_DICTIONARY);
2280 #endif
2281 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, 2276 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement,
2282 PrefService::UNSYNCABLE_PREF); 2277 PrefService::UNSYNCABLE_PREF);
2283 prefs->RegisterBooleanPref(prefs::kImportBookmarks, 2278 prefs->RegisterBooleanPref(prefs::kImportBookmarks,
2284 true, 2279 true,
2285 PrefService::UNSYNCABLE_PREF); 2280 PrefService::UNSYNCABLE_PREF);
2286 prefs->RegisterBooleanPref(prefs::kImportHistory, 2281 prefs->RegisterBooleanPref(prefs::kImportHistory,
2287 true, 2282 true,
2288 PrefService::UNSYNCABLE_PREF); 2283 PrefService::UNSYNCABLE_PREF);
2289 prefs->RegisterBooleanPref(prefs::kImportHomepage, 2284 prefs->RegisterBooleanPref(prefs::kImportHomepage,
2290 true, 2285 true,
(...skipping 2594 matching lines...) Expand 10 before | Expand all | Expand 10 after
4885 } 4880 }
4886 4881
4887 void Browser::ShowSyncSetup() { 4882 void Browser::ShowSyncSetup() {
4888 ProfileSyncService* service = 4883 ProfileSyncService* service =
4889 profile()->GetOriginalProfile()->GetProfileSyncService(); 4884 profile()->GetOriginalProfile()->GetProfileSyncService();
4890 if (service->HasSyncSetupCompleted()) 4885 if (service->HasSyncSetupCompleted())
4891 ShowOptionsTab(chrome::kSyncSetupSubPage); 4886 ShowOptionsTab(chrome::kSyncSetupSubPage);
4892 else 4887 else
4893 service->ShowLoginDialog(); 4888 service->ShowLoginDialog();
4894 } 4889 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/testing_pref_store.h ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698