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

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: Fix double registration in Chrome Frame test. Created 7 years, 10 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_registry_simple.h"
17 #include "chrome/browser/prefs/pref_service.h" 18 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/prefs/scoped_user_pref_update.h" 19 #include "chrome/browser/prefs/scoped_user_pref_update.h"
19 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
20 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
21 #include "googleurl/src/gurl.h" 22 #include "googleurl/src/gurl.h"
22 #include "net/base/escape.h" 23 #include "net/base/escape.h"
23 24
24 using content::BrowserThread; 25 using content::BrowserThread;
25 26
26 // Whether we accept requests for launching external protocols. This is set to 27 // Whether we accept requests for launching external protocols. This is set to
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 // Otherwise put this work on the file thread. On Windows ShellExecute may 290 // Otherwise put this work on the file thread. On Windows ShellExecute may
290 // block for a significant amount of time, and it shouldn't hurt on Linux. 291 // block for a significant amount of time, and it shouldn't hurt on Linux.
291 BrowserThread::PostTask( 292 BrowserThread::PostTask(
292 BrowserThread::FILE, 293 BrowserThread::FILE,
293 FROM_HERE, 294 FROM_HERE,
294 base::Bind(&platform_util::OpenExternal, url)); 295 base::Bind(&platform_util::OpenExternal, url));
295 #endif 296 #endif
296 } 297 }
297 298
298 // static 299 // static
299 void ExternalProtocolHandler::RegisterPrefs(PrefServiceSimple* prefs) { 300 void ExternalProtocolHandler::RegisterPrefs(PrefRegistrySimple* registry) {
300 prefs->RegisterDictionaryPref(prefs::kExcludedSchemes); 301 registry->RegisterDictionaryPref(prefs::kExcludedSchemes);
301 } 302 }
302 303
303 // static 304 // static
304 void ExternalProtocolHandler::PermitLaunchUrl() { 305 void ExternalProtocolHandler::PermitLaunchUrl() {
305 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); 306 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
306 g_accept_requests = true; 307 g_accept_requests = true;
307 } 308 }
OLDNEW
« no previous file with comments | « chrome/browser/external_protocol/external_protocol_handler.h ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698