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

Side by Side Diff: chrome/browser/external_protocol/external_protocol_handler.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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) 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/external_protocol/external_protocol_handler.h" 5 #include "chrome/browser/external_protocol/external_protocol_handler.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/platform_util.h" 16 #include "chrome/browser/platform_util.h"
17 #include "chrome/browser/prefs/pref_registrar_simple.h"
18 #include "chrome/browser/prefs/pref_registrar_simple.h"
17 #include "chrome/browser/prefs/pref_service.h" 19 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/prefs/scoped_user_pref_update.h" 20 #include "chrome/browser/prefs/scoped_user_pref_update.h"
19 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
20 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
21 #include "googleurl/src/gurl.h" 23 #include "googleurl/src/gurl.h"
22 #include "net/base/escape.h" 24 #include "net/base/escape.h"
23 25
24 using content::BrowserThread; 26 using content::BrowserThread;
25 27
26 // Whether we accept requests for launching external protocols. This is set to 28 // Whether we accept requests for launching external protocols. This is set to
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 // Otherwise put this work on the file thread. On Windows ShellExecute may 288 // Otherwise put this work on the file thread. On Windows ShellExecute may
287 // block for a significant amount of time, and it shouldn't hurt on Linux. 289 // block for a significant amount of time, and it shouldn't hurt on Linux.
288 BrowserThread::PostTask( 290 BrowserThread::PostTask(
289 BrowserThread::FILE, 291 BrowserThread::FILE,
290 FROM_HERE, 292 FROM_HERE,
291 base::Bind(&platform_util::OpenExternal, url)); 293 base::Bind(&platform_util::OpenExternal, url));
292 #endif 294 #endif
293 } 295 }
294 296
295 // static 297 // static
296 void ExternalProtocolHandler::RegisterPrefs(PrefServiceSimple* prefs) { 298 void ExternalProtocolHandler::RegisterPrefs(PrefRegistrarSimple* prefs) {
297 prefs->RegisterDictionaryPref(prefs::kExcludedSchemes); 299 prefs->RegisterDictionaryPref(prefs::kExcludedSchemes);
298 } 300 }
299 301
300 // static 302 // static
301 void ExternalProtocolHandler::PermitLaunchUrl() { 303 void ExternalProtocolHandler::PermitLaunchUrl() {
302 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); 304 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
303 g_accept_requests = true; 305 g_accept_requests = true;
304 } 306 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698