| Index: third_party/WebKit/Source/web/WebViewImpl.h
|
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h
|
| index 0d2ef17a875493e528182b6379e6c5155e61f7c2..157d72ad6486aca6ba3ef9705e4299e463164a34 100644
|
| --- a/third_party/WebKit/Source/web/WebViewImpl.h
|
| +++ b/third_party/WebKit/Source/web/WebViewImpl.h
|
| @@ -496,7 +496,7 @@ class WEB_EXPORT WebViewImpl final
|
| return last_frame_time_monotonic_;
|
| }
|
|
|
| - class ChromeClient& ChromeClient() const override {
|
| + class ChromeClient& GetChromeClient() const override {
|
| return *chrome_client_.Get();
|
| }
|
|
|
| @@ -603,9 +603,7 @@ class WEB_EXPORT WebViewImpl final
|
| WebViewClient* client_; // Can be 0 (e.g. unittests, shared workers, etc.)
|
| WebSpellCheckClient* spell_check_client_;
|
|
|
| - // ChromeClient needs blink:: qualifier so it doesn't clash with ChromeClient
|
| - // method. TODO(sashab): Rename getter to GetChromeClient to fix this.
|
| - Persistent<blink::ChromeClient> chrome_client_;
|
| + Persistent<ChromeClient> chrome_client_;
|
| ContextMenuClientImpl context_menu_client_impl_;
|
| EditorClientImpl editor_client_impl_;
|
| SpellCheckerClientImpl spell_checker_client_impl_;
|
|
|