diff options
author | sky <sky@chromium.org> | 2015-10-15 16:07:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-15 23:08:34 +0000 |
commit | bbcf04ebcf7a83dd6b93c451fc2d811c8aea8cc6 (patch) | |
tree | 3dfb96937d1dcca8adfb9bbe49e990b843f47514 /mojo | |
parent | 0b9c96b1b27fe9d92d741dddff1c9cb87cf3bee2 (diff) | |
download | chromium_src-bbcf04ebcf7a83dd6b93c451fc2d811c8aea8cc6.zip chromium_src-bbcf04ebcf7a83dd6b93c451fc2d811c8aea8cc6.tar.gz chromium_src-bbcf04ebcf7a83dd6b93c451fc2d811c8aea8cc6.tar.bz2 |
Adds GetDisplays() to WindowManager
And removes hacks that were necessitated without it.
I also added a converter from a std::string to a URLRequestPtr as I
got tired of creating the URLRequestPtr, then setting url.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1407073002
Cr-Commit-Position: refs/heads/master@{#354392}
Diffstat (limited to 'mojo')
-rw-r--r-- | mojo/converters/network/BUILD.gn | 13 | ||||
-rw-r--r-- | mojo/converters/network/network_type_converters.cc | 17 | ||||
-rw-r--r-- | mojo/converters/network/network_type_converters.h | 21 |
3 files changed, 51 insertions, 0 deletions
diff --git a/mojo/converters/network/BUILD.gn b/mojo/converters/network/BUILD.gn new file mode 100644 index 0000000..17308b0 --- /dev/null +++ b/mojo/converters/network/BUILD.gn @@ -0,0 +1,13 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("network") { + public_deps = [ + "//mojo/services/network/public/interfaces", + ] + sources = [ + "network_type_converters.cc", + "network_type_converters.h", + ] +} diff --git a/mojo/converters/network/network_type_converters.cc b/mojo/converters/network/network_type_converters.cc new file mode 100644 index 0000000..94109da --- /dev/null +++ b/mojo/converters/network/network_type_converters.cc @@ -0,0 +1,17 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "mojo/converters/network/network_type_converters.h" + +namespace mojo { + +// static +URLRequestPtr TypeConverter<URLRequestPtr, std::string>::Convert( + const std::string& input) { + URLRequestPtr result(URLRequest::New()); + result->url = input; + return result.Pass(); +} + +} // namespace mojo diff --git a/mojo/converters/network/network_type_converters.h b/mojo/converters/network/network_type_converters.h new file mode 100644 index 0000000..4092cd7 --- /dev/null +++ b/mojo/converters/network/network_type_converters.h @@ -0,0 +1,21 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef MOJO_CONVERTERS_NETWORK_NETWORK_TYPE_CONVERTERS_H_ +#define MOJO_CONVERTERS_NETWORK_NETWORK_TYPE_CONVERTERS_H_ + +#include <string> + +#include "mojo/services/network/public/interfaces/url_loader.mojom.h" + +namespace mojo { + +template <> +struct TypeConverter<URLRequestPtr, std::string> { + static URLRequestPtr Convert(const std::string& input); +}; + +} // namespace mojo + +#endif // MOJO_CONVERTERS_NETWORK_NETWORK_TYPE_CONVERTERS_H_ |