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

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

Issue 7976025: Revert 102113 - Aura: Use extension-based file picker from CrOS for pure-views builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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 2312 matching lines...) Expand 10 before | Expand all | Expand 10 after
2323 PrefService::UNSYNCABLE_PREF); 2323 PrefService::UNSYNCABLE_PREF);
2324 prefs->RegisterBooleanPref(prefs::kImportHomepage, 2324 prefs->RegisterBooleanPref(prefs::kImportHomepage,
2325 true, 2325 true,
2326 PrefService::UNSYNCABLE_PREF); 2326 PrefService::UNSYNCABLE_PREF);
2327 prefs->RegisterBooleanPref(prefs::kImportSearchEngine, 2327 prefs->RegisterBooleanPref(prefs::kImportSearchEngine,
2328 true, 2328 true,
2329 PrefService::UNSYNCABLE_PREF); 2329 PrefService::UNSYNCABLE_PREF);
2330 prefs->RegisterBooleanPref(prefs::kImportSavedPasswords, 2330 prefs->RegisterBooleanPref(prefs::kImportSavedPasswords,
2331 true, 2331 true,
2332 PrefService::UNSYNCABLE_PREF); 2332 PrefService::UNSYNCABLE_PREF);
2333 // The map of timestamps of the last used file browser handlers.
2334 prefs->RegisterDictionaryPref(prefs::kLastUsedFileBrowserHandlers,
2335 PrefService::UNSYNCABLE_PREF);
2336 2333
2337 // We need to register the type of these preferences in order to query 2334 // We need to register the type of these preferences in order to query
2338 // them even though they're only typically controlled via policy. 2335 // them even though they're only typically controlled via policy.
2339 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, 2336 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs,
2340 false, 2337 false,
2341 PrefService::UNSYNCABLE_PREF); 2338 PrefService::UNSYNCABLE_PREF);
2342 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, 2339 prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated,
2343 false, 2340 false,
2344 PrefService::UNSYNCABLE_PREF); 2341 PrefService::UNSYNCABLE_PREF);
2345 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, 2342 prefs->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize,
(...skipping 2928 matching lines...) Expand 10 before | Expand all | Expand 10 after
5274 } else if (is_type_tabbed()) { 5271 } else if (is_type_tabbed()) {
5275 GlobalErrorService* service = 5272 GlobalErrorService* service =
5276 GlobalErrorServiceFactory::GetForProfile(profile()); 5273 GlobalErrorServiceFactory::GetForProfile(profile());
5277 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5274 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5278 if (error) { 5275 if (error) {
5279 error->ShowBubbleView(this); 5276 error->ShowBubbleView(this);
5280 did_show_bubble = true; 5277 did_show_bubble = true;
5281 } 5278 }
5282 } 5279 }
5283 } 5280 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/file_manager_util.cc ('k') | chrome/browser/ui/views/file_manager_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698