Onion Soup ColorChooser
* Moved mojom definitions from content(/public)/common to
WebKit/common/color_chooser.
* Mojo calls are now made directly from blink in ColorChooserUIController.
* Deleted unneeded implementation files:
- content/renderer/renderer_webcolorchooser_impl.[h|cc]
- third_party/WebKit/public/web/WebColorChooser.h
- third_party/WebKit/public/web/WebColorChooserClient.h
- third_party/WebKit/public/web/WebColorSuggestion.h
- third_party/WebKit/Source/core/exported/WebColorSuggestion.cpp
- third_party/WebKit/Source/platform/ColorSuggestion.h
* Deleted unneeded test mock files:
- content/shell/test_runner/mock_color_chooser.[h|cc]
- replaced with mock-colorchooser.js to intercept mojo calls.
Bug: 788960
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_chromium_dbg_ng
Change-Id: I305a2abb3cba457042c877e6401abbe383611c75
Reviewed-on: https://chromium-review.googlesource.com/821954
Reviewed-by: Sam McNally <[email protected]>
Reviewed-by: Ken Buchanan <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Commit-Queue: Joel Hockey <[email protected]>
Cr-Commit-Position: refs/heads/master@{#525311}diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9b9eb48..3d2ea2f9 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -393,11 +393,11 @@
};
// WebContentsImpl::ColorChooser ----------------------------------------------
-class WebContentsImpl::ColorChooser : public mojom::ColorChooser {
+class WebContentsImpl::ColorChooser : public blink::mojom::ColorChooser {
public:
ColorChooser(content::ColorChooser* chooser,
- mojom::ColorChooserRequest request,
- mojom::ColorChooserClientPtr client)
+ blink::mojom::ColorChooserRequest request,
+ blink::mojom::ColorChooserClientPtr client)
: chooser_(chooser),
binding_(this, std::move(request)),
client_(std::move(client)) {
@@ -421,10 +421,10 @@
std::unique_ptr<content::ColorChooser> chooser_;
// mojo bindings.
- mojo::Binding<mojom::ColorChooser> binding_;
+ mojo::Binding<blink::mojom::ColorChooser> binding_;
// mojo renderer client.
- content::mojom::ColorChooserClientPtr client_;
+ blink::mojom::ColorChooserClientPtr client_;
};
// WebContentsImpl::WebContentsTreeNode ----------------------------------------
@@ -4213,15 +4213,15 @@
}
void WebContentsImpl::OnColorChooserFactoryRequest(
- mojom::ColorChooserFactoryRequest request) {
+ blink::mojom::ColorChooserFactoryRequest request) {
color_chooser_factory_bindings_.AddBinding(this, std::move(request));
}
void WebContentsImpl::OpenColorChooser(
- mojom::ColorChooserRequest chooser_request,
- mojom::ColorChooserClientPtr client,
+ blink::mojom::ColorChooserRequest chooser_request,
+ blink::mojom::ColorChooserClientPtr client,
SkColor color,
- std::vector<mojom::ColorSuggestionPtr> suggestions) {
+ std::vector<blink::mojom::ColorSuggestionPtr> suggestions) {
content::ColorChooser* new_color_chooser =
delegate_ ? delegate_->OpenColorChooser(this, color, suggestions)
: nullptr;
