diff options
author | jamescook <jamescook@chromium.org> | 2016-03-25 14:28:59 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 21:29:57 +0000 |
commit | da88c32858fdbc6040b07d51019d9f564e37416e (patch) | |
tree | 8f9aa64cb05eea75406425170c4b02ca171d9eca /ui | |
parent | 0e07a14f1d8515fb5802c03e7c30dfe0bae4a87d (diff) | |
download | chromium_src-da88c32858fdbc6040b07d51019d9f564e37416e.zip chromium_src-da88c32858fdbc6040b07d51019d9f564e37416e.tar.gz chromium_src-da88c32858fdbc6040b07d51019d9f564e37416e.tar.bz2 |
mus: Remove unnecessary const from property TypeConverter templates
This allows them to be used with the idiomatic mojo::ConvertTo<Foo>() template.
(In particular, ConvertTo<Foo>(my_vector) matches my_vector to "const U&" to
determine which TypeConverter to call. If my_vector is either a "std::vector"
or a "const std::vector" it ends up looking for TypeConverter<Foo, std::vector>.
Since the second TypeConverter template parameter isn't const, the compiler
can't find our existing TypeConverter<Foo, const std::vector> functions. These
functions don't need their template parameter to be const std::vector, as they
use "const std::vector&" for their inputs regardless.)
BUG=none
TEST=compiles
Review URL: https://codereview.chromium.org/1832133002
Cr-Commit-Position: refs/heads/master@{#383366}
Diffstat (limited to 'ui')
-rw-r--r-- | ui/views/mus/native_widget_mus.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc index 9b99d6b..48eb6d0 100644 --- a/ui/views/mus/native_widget_mus.cc +++ b/ui/views/mus/native_widget_mus.cc @@ -349,25 +349,22 @@ void NativeWidgetMus::ConfigurePropertiesForNewWindow( std::map<std::string, std::vector<uint8_t>>* properties) { if (!init_params.bounds.IsEmpty()) { (*properties)[mus::mojom::WindowManager::kUserSetBounds_Property] = - mojo::TypeConverter<const std::vector<uint8_t>, gfx::Rect>::Convert( - init_params.bounds); + mojo::ConvertTo<std::vector<uint8_t>>(init_params.bounds); } if (!Widget::RequiresNonClientView(init_params.type)) return; (*properties)[mus::mojom::WindowManager::kWindowType_Property] = - mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert( - static_cast<int32_t>( - mojo::ConvertTo<mus::mojom::WindowType>(init_params.type))); + mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>( + mojo::ConvertTo<mus::mojom::WindowType>(init_params.type))); (*properties)[mus::mojom::WindowManager::kResizeBehavior_Property] = - mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert( + mojo::ConvertTo<std::vector<uint8_t>>( ResizeBehaviorFromDelegate(init_params.delegate)); SkBitmap app_icon = AppIconFromDelegate(init_params.delegate); if (!app_icon.isNull()) { (*properties)[mus::mojom::WindowManager::kWindowAppIcon_Property] = - mojo::TypeConverter<const std::vector<uint8_t>, SkBitmap>::Convert( - app_icon); + mojo::ConvertTo<std::vector<uint8_t>>(app_icon); } } |