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

Side by Side Diff: trunk/src/win8/viewer/metro_viewer_process_host.cc

Issue 312553004: Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | « trunk/src/win8/metro_driver/chrome_app_view_ash.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "win8/viewer/metro_viewer_process_host.h" 5 #include "win8/viewer/metro_viewer_process_host.h"
6 6
7 #include <shlobj.h> 7 #include <shlobj.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 void MetroViewerProcessHost::InternalMessageFilter::OnChannelConnected( 44 void MetroViewerProcessHost::InternalMessageFilter::OnChannelConnected(
45 int32 /* peer_pid */) { 45 int32 /* peer_pid */) {
46 owner_->NotifyChannelConnected(); 46 owner_->NotifyChannelConnected();
47 } 47 }
48 48
49 MetroViewerProcessHost::MetroViewerProcessHost( 49 MetroViewerProcessHost::MetroViewerProcessHost(
50 base::SingleThreadTaskRunner* ipc_task_runner) { 50 base::SingleThreadTaskRunner* ipc_task_runner) {
51 DCHECK(!instance_); 51 DCHECK(!instance_);
52 instance_ = this; 52 instance_ = this;
53 53
54 channel_ = IPC::ChannelProxy::CreateNamedServer( 54 channel_.reset(new IPC::ChannelProxy(
55 kMetroViewerIPCChannelName, 55 kMetroViewerIPCChannelName,
56 IPC::Channel::MODE_NAMED_SERVER,
56 this, 57 this,
57 ipc_task_runner); 58 ipc_task_runner));
58 } 59 }
59 60
60 MetroViewerProcessHost::~MetroViewerProcessHost() { 61 MetroViewerProcessHost::~MetroViewerProcessHost() {
61 if (!channel_) { 62 if (!channel_) {
62 instance_ = NULL; 63 instance_ = NULL;
63 return; 64 return;
64 } 65 }
65 66
66 base::ProcessId viewer_process_id = GetViewerProcessId(); 67 base::ProcessId viewer_process_id = GetViewerProcessId();
67 channel_->Close(); 68 channel_->Close();
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 const base::FilePath& folder) { 336 const base::FilePath& folder) {
336 if (success) 337 if (success)
337 select_folder_completion_callback_.Run(base::FilePath(folder), 0, NULL); 338 select_folder_completion_callback_.Run(base::FilePath(folder), 0, NULL);
338 else 339 else
339 failure_callback_.Run(NULL); 340 failure_callback_.Run(NULL);
340 select_folder_completion_callback_.Reset(); 341 select_folder_completion_callback_.Reset();
341 failure_callback_.Reset(); 342 failure_callback_.Reset();
342 } 343 }
343 344
344 } // namespace win8 345 } // namespace win8
OLDNEW
« no previous file with comments | « trunk/src/win8/metro_driver/chrome_app_view_ash.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698