summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/serial/serial_api.cc
diff options
context:
space:
mode:
authormiket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 00:16:47 +0000
committermiket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 00:16:47 +0000
commitece26dd93e5f4c9aa72e9ee2927ff8e9660e7174 (patch)
tree81ad0f1d20d36fa95ee728d1dc36468bdcf926e7 /chrome/browser/extensions/api/serial/serial_api.cc
parentd5a578fa1357a7bb59351f43fa23509d8e14766e (diff)
downloadchromium_src-ece26dd93e5f4c9aa72e9ee2927ff8e9660e7174.zip
chromium_src-ece26dd93e5f4c9aa72e9ee2927ff8e9660e7174.tar.gz
chromium_src-ece26dd93e5f4c9aa72e9ee2927ff8e9660e7174.tar.bz2
Move serial out of experimental.
This CL is unremarkable except that I figured out that we're improperly including some permissions for experimental APIs (which are already covered by the blanket experimental permission). This made it tougher because I used http://codereview.chromium.org/10440097/, which benefited unwittingly from a pre-declared socket permission, as an example. I then ran into missing namespace problems because I hadn't done everything necessary (such as including serial in api_permission.cc). I did my job as a good citizen and removed the superfluous USB permission. Also ran build.py to update docs. BUG=138370 TEST=no new ones; updated old ones to build. Review URL: https://chromiumcodereview.appspot.com/10852016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/serial/serial_api.cc')
-rw-r--r--chrome/browser/extensions/api/serial/serial_api.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/extensions/api/serial/serial_api.cc b/chrome/browser/extensions/api/serial/serial_api.cc
index 6a5e173..87a61c2 100644
--- a/chrome/browser/extensions/api/serial/serial_api.cc
+++ b/chrome/browser/extensions/api/serial/serial_api.cc
@@ -89,7 +89,7 @@ SerialOpenFunction::~SerialOpenFunction() {
bool SerialOpenFunction::Prepare() {
set_work_thread_id(BrowserThread::FILE);
- params_ = api::experimental_serial::Open::Params::Create(*args_);
+ params_ = api::serial::Open::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get());
if (params_->options.get()) {
@@ -166,7 +166,7 @@ SerialCloseFunction::~SerialCloseFunction() {
bool SerialCloseFunction::Prepare() {
set_work_thread_id(BrowserThread::FILE);
- params_ = api::experimental_serial::Close::Params::Create(*args_);
+ params_ = api::serial::Close::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get());
return true;
@@ -197,7 +197,7 @@ SerialReadFunction::~SerialReadFunction() {
bool SerialReadFunction::Prepare() {
set_work_thread_id(BrowserThread::FILE);
- params_ = api::experimental_serial::Read::Params::Create(*args_);
+ params_ = api::serial::Read::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get());
if (params_->bytes_to_read <= 0 || params_->bytes_to_read >= 1024 * 1024) {
error_ = kSerialReadInvalidBytesToRead;
@@ -242,7 +242,7 @@ SerialWriteFunction::~SerialWriteFunction() {
bool SerialWriteFunction::Prepare() {
set_work_thread_id(BrowserThread::FILE);
- params_ = api::experimental_serial::Write::Params::Create(*args_);
+ params_ = api::serial::Write::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get());
io_buffer_size_ = params_->data.size();
@@ -277,7 +277,7 @@ SerialFlushFunction::~SerialFlushFunction() {
bool SerialFlushFunction::Prepare() {
set_work_thread_id(BrowserThread::FILE);
- params_ = api::experimental_serial::Flush::Params::Create(*args_);
+ params_ = api::serial::Flush::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get());
return true;
}
@@ -307,7 +307,7 @@ SerialGetControlSignalsFunction::~SerialGetControlSignalsFunction() {
bool SerialGetControlSignalsFunction::Prepare() {
set_work_thread_id(BrowserThread::FILE);
- params_ = api::experimental_serial::GetControlSignals::Params::Create(
+ params_ = api::serial::GetControlSignals::Params::Create(
*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get());
@@ -347,7 +347,7 @@ SerialSetControlSignalsFunction::~SerialSetControlSignalsFunction() {
bool SerialSetControlSignalsFunction::Prepare() {
set_work_thread_id(BrowserThread::FILE);
- params_ = api::experimental_serial::SetControlSignals::Params::Create(
+ params_ = api::serial::SetControlSignals::Params::Create(
*args_);
EXTENSION_FUNCTION_VALIDATE(params_.get());