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

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

Issue 11106007: drive: Rename 'gdata' namespace to 'drive' in chrome/browser/chromeos/drive (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 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/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 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 chrome::kChromeUIScheme, 633 chrome::kChromeUIScheme,
634 ChromeURLDataManagerBackend::CreateProtocolHandler( 634 ChromeURLDataManagerBackend::CreateProtocolHandler(
635 chrome_url_data_manager_backend_.get())); 635 chrome_url_data_manager_backend_.get()));
636 DCHECK(set_protocol); 636 DCHECK(set_protocol);
637 set_protocol = job_factory->SetProtocolHandler( 637 set_protocol = job_factory->SetProtocolHandler(
638 chrome::kDataScheme, new net::DataProtocolHandler()); 638 chrome::kDataScheme, new net::DataProtocolHandler());
639 DCHECK(set_protocol); 639 DCHECK(set_protocol);
640 #if defined(OS_CHROMEOS) 640 #if defined(OS_CHROMEOS)
641 if (!is_incognito()) { 641 if (!is_incognito()) {
642 set_protocol = job_factory->SetProtocolHandler( 642 set_protocol = job_factory->SetProtocolHandler(
643 chrome::kDriveScheme, new gdata::DriveProtocolHandler()); 643 chrome::kDriveScheme, new drive::DriveProtocolHandler());
644 DCHECK(set_protocol); 644 DCHECK(set_protocol);
645 } 645 }
646 #if !defined(GOOGLE_CHROME_BUILD) 646 #if !defined(GOOGLE_CHROME_BUILD)
647 // Install the GView request interceptor that will redirect requests 647 // Install the GView request interceptor that will redirect requests
648 // of compatible documents (PDF, etc) to the GView document viewer. 648 // of compatible documents (PDF, etc) to the GView document viewer.
649 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); 649 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
650 if (parsed_command_line.HasSwitch(switches::kEnableGView)) 650 if (parsed_command_line.HasSwitch(switches::kEnableGView))
651 job_factory->AddInterceptor(new chromeos::GViewRequestInterceptor); 651 job_factory->AddInterceptor(new chromeos::GViewRequestInterceptor);
652 #endif // !defined(GOOGLE_CHROME_BUILD) 652 #endif // !defined(GOOGLE_CHROME_BUILD)
653 #endif // defined(OS_CHROMEOS) 653 #endif // defined(OS_CHROMEOS)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 params->http_pipelining_enabled = globals->http_pipelining_enabled; 716 params->http_pipelining_enabled = globals->http_pipelining_enabled;
717 params->testing_fixed_http_port = globals->testing_fixed_http_port; 717 params->testing_fixed_http_port = globals->testing_fixed_http_port;
718 params->testing_fixed_https_port = globals->testing_fixed_https_port; 718 params->testing_fixed_https_port = globals->testing_fixed_https_port;
719 719
720 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 720 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
721 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { 721 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) {
722 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( 722 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII(
723 switches::kTrustedSpdyProxy); 723 switches::kTrustedSpdyProxy);
724 } 724 }
725 } 725 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/webstore_installer.cc ('k') | chrome/browser/ui/ash/screenshot_taker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698