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

Side by Side Diff: chrome/browser/extensions/api/messaging/native_message_port.cc

Issue 1413543005: Use FrameTreeNode ID as frameId in extension APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Improve port lifetime management, add tests Created 5 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
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/extensions/api/messaging/native_message_port.h" 5 #include "chrome/browser/extensions/api/messaging/native_message_port.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h" 10 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 core_.reset(new Core(native_message_host.Pass(), 93 core_.reset(new Core(native_message_host.Pass(),
94 weak_factory_.GetWeakPtr(), 94 weak_factory_.GetWeakPtr(),
95 base::ThreadTaskRunnerHandle::Get())); 95 base::ThreadTaskRunnerHandle::Get()));
96 } 96 }
97 97
98 NativeMessagePort::~NativeMessagePort() { 98 NativeMessagePort::~NativeMessagePort() {
99 DCHECK(thread_checker_.CalledOnValidThread()); 99 DCHECK(thread_checker_.CalledOnValidThread());
100 host_task_runner_->DeleteSoon(FROM_HERE, core_.release()); 100 host_task_runner_->DeleteSoon(FROM_HERE, core_.release());
101 } 101 }
102 102
103 void NativeMessagePort::DispatchOnMessage( 103 void NativeMessagePort::DispatchOnMessage(const Message& message) {
104 const Message& message,
105 int target_port_id) {
106 DCHECK(thread_checker_.CalledOnValidThread()); 104 DCHECK(thread_checker_.CalledOnValidThread());
107 core_->OnMessageFromChrome(message.data); 105 core_->OnMessageFromChrome(message.data);
108 } 106 }
109 107
110 void NativeMessagePort::PostMessageFromNativeHost(const std::string& message) { 108 void NativeMessagePort::PostMessageFromNativeHost(const std::string& message) {
111 DCHECK(thread_checker_.CalledOnValidThread()); 109 DCHECK(thread_checker_.CalledOnValidThread());
112 if (weak_message_service_) { 110 if (weak_message_service_) {
113 weak_message_service_->PostMessage( 111 weak_message_service_->PostMessage(
114 port_id_, Message(message, false /* user_gesture */)); 112 port_id_, Message(message, false /* user_gesture */));
115 } 113 }
116 } 114 }
117 115
118 void NativeMessagePort::CloseChannel(const std::string& error_message) { 116 void NativeMessagePort::CloseChannel(const std::string& error_message) {
119 DCHECK(thread_checker_.CalledOnValidThread()); 117 DCHECK(thread_checker_.CalledOnValidThread());
120 if (weak_message_service_) { 118 if (weak_message_service_) {
121 weak_message_service_->CloseChannel(port_id_, error_message); 119 weak_message_service_->CloseChannel(port_id_, error_message);
122 } 120 }
123 } 121 }
124 122
125 } // namespace extensions 123 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698