diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h')
| -rw-r--r-- | chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h b/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h index 18a8fca7599..ed575daff9a 100644 --- a/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h +++ b/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h @@ -35,7 +35,7 @@ class ColorChooserClient; class PagePopup; } -namespace WebKit { +namespace blink { class ColorChooserPopupUIController : public ColorChooserUIController, public WebCore::PagePopupClient { @@ -64,7 +64,7 @@ private: ChromeClientImpl* m_chromeClient; WebCore::ColorChooserClient* m_client; WebCore::PagePopup* m_popup; - OwnPtr<WebCore::Locale> m_locale; + WebCore::Locale& m_locale; }; } |