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

Side by Side Diff: remoting/host/remoting_me2me_host.cc

Issue 11053024: Remove ChromotingHostContext from DnsBlackholeChecker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « remoting/host/dns_blackhole_checker.cc ('k') | remoting/host/simple_host_process.cc » ('j') | 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) 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 // This file implements a standalone host process for Me2Me. 5 // This file implements a standalone host process for Me2Me.
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 515
516 if (shutting_down_) 516 if (shutting_down_)
517 return; 517 return;
518 518
519 signal_strategy_.reset( 519 signal_strategy_.reset(
520 new XmppSignalStrategy(context_->url_request_context_getter(), 520 new XmppSignalStrategy(context_->url_request_context_getter(),
521 xmpp_login_, xmpp_auth_token_, 521 xmpp_login_, xmpp_auth_token_,
522 xmpp_auth_service_)); 522 xmpp_auth_service_));
523 523
524 scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker( 524 scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker(
525 new DnsBlackholeChecker(context_.get(), talkgadget_prefix_)); 525 new DnsBlackholeChecker(context_->url_request_context_getter(),
526 talkgadget_prefix_));
526 527
527 signaling_connector_.reset(new SignalingConnector( 528 signaling_connector_.reset(new SignalingConnector(
528 signal_strategy_.get(), context_.get(), dns_blackhole_checker.Pass(), 529 signal_strategy_.get(), context_.get(), dns_blackhole_checker.Pass(),
529 base::Bind(&HostProcess::OnAuthFailed, base::Unretained(this)))); 530 base::Bind(&HostProcess::OnAuthFailed, base::Unretained(this))));
530 531
531 if (!oauth_refresh_token_.empty()) { 532 if (!oauth_refresh_token_.empty()) {
532 OAuthClientInfo client_info = { 533 OAuthClientInfo client_info = {
533 kUnofficialOAuth2ClientId, 534 kUnofficialOAuth2ClientId,
534 kUnofficialOAuth2ClientSecret 535 kUnofficialOAuth2ClientSecret
535 }; 536 };
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 user32.GetFunctionPointer("SetProcessDPIAware")); 828 user32.GetFunctionPointer("SetProcessDPIAware"));
828 set_process_dpi_aware(); 829 set_process_dpi_aware();
829 } 830 }
830 831
831 // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting 832 // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
832 // the command line from GetCommandLineW(), so we can safely pass NULL here. 833 // the command line from GetCommandLineW(), so we can safely pass NULL here.
833 return main(0, NULL); 834 return main(0, NULL);
834 } 835 }
835 836
836 #endif // defined(OS_WIN) 837 #endif // defined(OS_WIN)
OLDNEW
« no previous file with comments | « remoting/host/dns_blackhole_checker.cc ('k') | remoting/host/simple_host_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698