diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 19:58:52 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 19:58:52 +0000 |
| commit | dc85cefeac3ce32fe326af854676f4d0ca3bd90a (patch) | |
| tree | 73fc7ff21bc50d1c36c8c082397f7f6651d23c76 /extensions | |
| parent | 4b22d0aac0b8300ea268a92ae071235902efad83 (diff) | |
| download | chromium_src-dc85cefeac3ce32fe326af854676f4d0ca3bd90a.zip chromium_src-dc85cefeac3ce32fe326af854676f4d0ca3bd90a.tar.gz chromium_src-dc85cefeac3ce32fe326af854676f4d0ca3bd90a.tar.bz2 | |
Revert 262175 "* Replace "read" method with onReceiveXxx events."
Failed compile on Linux CrOS Full: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Full/builds/2043/steps/compile/logs/stdio
> * Replace "read" method with onReceiveXxx events.
> * Few minor changes to idl file.
> * Socket implementation on Windows fully implemented and with (hopefully) correct threading usage.
> * ChromeOS and MacOS socket implementation empty for now (they will come in later CLs).
>
> BUG=336824,340363, 340413, 343651, 344081
>
> Review URL: https://codereview.chromium.org/180163009
TBR=rpaquay@chromium.org
Review URL: https://codereview.chromium.org/227493006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/api/api_resource_manager.h | 45 | ||||
| -rw-r--r-- | extensions/browser/api/async_api_function.h | 1 | ||||
| -rw-r--r-- | extensions/browser/extension_function_histogram_value.h | 4 |
3 files changed, 14 insertions, 36 deletions
diff --git a/extensions/browser/api/api_resource_manager.h b/extensions/browser/api/api_resource_manager.h index e0c9b81..6374abe 100644 --- a/extensions/browser/api/api_resource_manager.h +++ b/extensions/browser/api/api_resource_manager.h @@ -25,8 +25,6 @@ namespace extensions { namespace api { -class BluetoothSocketApiFunction; -class BluetoothSocketEventDispatcher; class SerialEventDispatcher; } @@ -154,9 +152,6 @@ class ApiResourceManager : public BrowserContextKeyedAPI, private: // TODO(rockot): ApiResourceData could be moved out of ApiResourceManager and // we could avoid maintaining a friends list here. - friend class BluetoothAPI; - friend class api::BluetoothSocketApiFunction; - friend class api::BluetoothSocketEventDispatcher; friend class api::SerialEventDispatcher; friend class core_api::TCPServerSocketEventDispatcher; friend class core_api::TCPSocketEventDispatcher; @@ -220,38 +215,26 @@ class ApiResourceManager : public BrowserContextKeyedAPI, } void InitiateExtensionUnloadedCleanup(const std::string& extension_id) { - if (content::BrowserThread::CurrentlyOn(thread_id_)) { - CleanupResourcesFromUnloadedExtension(extension_id); - } else { - content::BrowserThread::PostTask( - thread_id_, - FROM_HERE, - base::Bind(&ApiResourceData::CleanupResourcesFromUnloadedExtension, - this, - extension_id)); - } + content::BrowserThread::PostTask( + thread_id_, + FROM_HERE, + base::Bind(&ApiResourceData::CleanupResourcesFromUnloadedExtension, + this, + extension_id)); } void InitiateExtensionSuspendedCleanup(const std::string& extension_id) { - if (content::BrowserThread::CurrentlyOn(thread_id_)) { - CleanupResourcesFromSuspendedExtension(extension_id); - } else { - content::BrowserThread::PostTask( - thread_id_, - FROM_HERE, - base::Bind(&ApiResourceData::CleanupResourcesFromSuspendedExtension, - this, - extension_id)); - } + content::BrowserThread::PostTask( + thread_id_, + FROM_HERE, + base::Bind(&ApiResourceData::CleanupResourcesFromSuspendedExtension, + this, + extension_id)); } void InititateCleanup() { - if (content::BrowserThread::CurrentlyOn(thread_id_)) { - Cleanup(); - } else { - content::BrowserThread::PostTask( - thread_id_, FROM_HERE, base::Bind(&ApiResourceData::Cleanup, this)); - } + content::BrowserThread::PostTask( + thread_id_, FROM_HERE, base::Bind(&ApiResourceData::Cleanup, this)); } private: diff --git a/extensions/browser/api/async_api_function.h b/extensions/browser/api/async_api_function.h index b18ec4d..dd4b500 100644 --- a/extensions/browser/api/async_api_function.h +++ b/extensions/browser/api/async_api_function.h @@ -42,7 +42,6 @@ class AsyncApiFunction : public UIThreadExtensionFunction { virtual bool RunImpl() OVERRIDE; protected: - content::BrowserThread::ID work_thread_id() const { return work_thread_id_; } void set_work_thread_id(content::BrowserThread::ID work_thread_id) { work_thread_id_ = work_thread_id; } diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h index ec2a0ca..17eee77 100644 --- a/extensions/browser/extension_function_histogram_value.h +++ b/extensions/browser/extension_function_histogram_value.h @@ -770,10 +770,6 @@ enum HistogramValue { BLUETOOTHPRIVATE_SETPAIRINGRESPONSE, NETWORKINGPRIVATE_GETCAPTIVEPORTALSTATUS, AUTOMATIONINTERNAL_PERFORMACTION, - BLUETOOTH_UPDATE_SOCKET, - BLUETOOTH_SET_SOCKET_PAUSED, - BLUETOOTH_GET_SOCKET, - BLUETOOTH_GET_SOCKETS, // Last entry: Add new entries above and ensure to update // tools/metrics/histograms/histograms/histograms.xml. ENUM_BOUNDARY |