Commit 2c935aff authored by sashab's avatar sashab Committed by Commit Bot

Remove dependency of ColorChooserPopupUIController on ChromeClientImpl

BUG=712963

Review-Url: https://codereview.chromium.org/2919593004
Cr-Commit-Position: refs/heads/master@{#476238}
parent 9d76dcf9
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
#include "core/frame/LocalFrame.h" #include "core/frame/LocalFrame.h"
#include "core/frame/LocalFrameView.h" #include "core/frame/LocalFrameView.h"
#include "core/html/forms/ColorChooserClient.h" #include "core/html/forms/ColorChooserClient.h"
#include "core/page/ChromeClient.h"
#include "core/page/PagePopup.h" #include "core/page/PagePopup.h"
#include "platform/geometry/IntRect.h" #include "platform/geometry/IntRect.h"
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
#include "public/web/WebColorChooser.h" #include "public/web/WebColorChooser.h"
#include "web/ChromeClientImpl.h"
namespace blink { namespace blink {
...@@ -45,7 +45,7 @@ enum ColorPickerPopupAction { ...@@ -45,7 +45,7 @@ enum ColorPickerPopupAction {
ColorChooserPopupUIController::ColorChooserPopupUIController( ColorChooserPopupUIController::ColorChooserPopupUIController(
LocalFrame* frame, LocalFrame* frame,
ChromeClientImpl* chrome_client, ChromeClient* chrome_client,
ColorChooserClient* client) ColorChooserClient* client)
: ColorChooserUIController(frame, client), : ColorChooserUIController(frame, client),
chrome_client_(chrome_client), chrome_client_(chrome_client),
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
namespace blink { namespace blink {
class ChromeClientImpl; class ChromeClient;
class ColorChooserClient; class ColorChooserClient;
class PagePopup; class PagePopup;
...@@ -41,7 +41,7 @@ class ColorChooserPopupUIController final : public ColorChooserUIController, ...@@ -41,7 +41,7 @@ class ColorChooserPopupUIController final : public ColorChooserUIController,
public: public:
static ColorChooserPopupUIController* Create(LocalFrame* frame, static ColorChooserPopupUIController* Create(LocalFrame* frame,
ChromeClientImpl* chrome_client, ChromeClient* chrome_client,
ColorChooserClient* client) { ColorChooserClient* client) {
return new ColorChooserPopupUIController(frame, chrome_client, client); return new ColorChooserPopupUIController(frame, chrome_client, client);
} }
...@@ -68,13 +68,13 @@ class ColorChooserPopupUIController final : public ColorChooserUIController, ...@@ -68,13 +68,13 @@ class ColorChooserPopupUIController final : public ColorChooserUIController,
private: private:
ColorChooserPopupUIController(LocalFrame*, ColorChooserPopupUIController(LocalFrame*,
ChromeClientImpl*, ChromeClient*,
ColorChooserClient*); ColorChooserClient*);
void OpenPopup(); void OpenPopup();
void Dispose(); void Dispose();
Member<ChromeClientImpl> chrome_client_; Member<ChromeClient> chrome_client_;
PagePopup* popup_; PagePopup* popup_;
Locale& locale_; Locale& locale_;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment