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

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 8357019: Restricting set of URL requests that get intercepted to gview to GET methods with scheme http (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/extensions/file_manager_util.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/profiles/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 new ChromeBlobProtocolHandler( 477 new ChromeBlobProtocolHandler(
478 profile_params_->blob_storage_context->controller(), 478 profile_params_->blob_storage_context->controller(),
479 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE))); 479 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
480 DCHECK(set_protocol); 480 DCHECK(set_protocol);
481 set_protocol = job_factory_->SetProtocolHandler( 481 set_protocol = job_factory_->SetProtocolHandler(
482 chrome::kFileSystemScheme, 482 chrome::kFileSystemScheme,
483 CreateFileSystemProtocolHandler( 483 CreateFileSystemProtocolHandler(
484 profile_params_->file_system_context, 484 profile_params_->file_system_context,
485 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE))); 485 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
486 DCHECK(set_protocol); 486 DCHECK(set_protocol);
487 #if defined(OS_CHROMEOS) 487 #if defined(OS_CHROMEOS) && !defined(GOOGLE_CHROME_BUILD)
488 // Install the GView request interceptor that will redirect requests 488 // Install the GView request interceptor that will redirect requests
489 // of compatible documents (PDF, etc) to the GView document viewer. 489 // of compatible documents (PDF, etc) to the GView document viewer.
490 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); 490 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
491 if (parsed_command_line.HasSwitch(switches::kEnableGView)) 491 if (parsed_command_line.HasSwitch(switches::kEnableGView))
492 job_factory_->AddInterceptor(new chromeos::GViewRequestInterceptor); 492 job_factory_->AddInterceptor(new chromeos::GViewRequestInterceptor);
493 #endif // defined(OS_CHROMEOS) 493 #endif // defined(OS_CHROMEOS) && !defined(GOOGLE_CHROME_BUILD)
494 494
495 media_stream_manager_.reset(new media_stream::MediaStreamManager); 495 media_stream_manager_.reset(new media_stream::MediaStreamManager);
496 496
497 // Take ownership over these parameters. 497 // Take ownership over these parameters.
498 database_tracker_ = profile_params_->database_tracker; 498 database_tracker_ = profile_params_->database_tracker;
499 appcache_service_ = profile_params_->appcache_service; 499 appcache_service_ = profile_params_->appcache_service;
500 blob_storage_context_ = profile_params_->blob_storage_context; 500 blob_storage_context_ = profile_params_->blob_storage_context;
501 file_system_context_ = profile_params_->file_system_context; 501 file_system_context_ = profile_params_->file_system_context;
502 quota_manager_ = profile_params_->quota_manager; 502 quota_manager_ = profile_params_->quota_manager;
503 host_zoom_map_ = profile_params_->host_zoom_map; 503 host_zoom_map_ = profile_params_->host_zoom_map;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, 553 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
554 new DeleteTask<ProfileIOData>(this)); 554 new DeleteTask<ProfileIOData>(this));
555 if (!posted) 555 if (!posted)
556 delete this; 556 delete this;
557 } 557 }
558 558
559 void ProfileIOData::set_origin_bound_cert_service( 559 void ProfileIOData::set_origin_bound_cert_service(
560 net::OriginBoundCertService* origin_bound_cert_service) const { 560 net::OriginBoundCertService* origin_bound_cert_service) const {
561 origin_bound_cert_service_.reset(origin_bound_cert_service); 561 origin_bound_cert_service_.reset(origin_bound_cert_service);
562 } 562 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/file_manager_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698