Renamed WebViewBase::ChromeClient to GetChromeClient

third_party/WebKit/Source/web/WebViewImpl.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 478 matching lines @@
   WebDisplayMode DisplayMode() const override { return display_mode_; }
 
   PageScaleConstraintsSet& GetPageScaleConstraintsSet() const override;
 
   FloatSize ElasticOverscroll() const override { return elastic_overscroll_; }
 
   double LastFrameTimeMonotonic() const override {
     return last_frame_time_monotonic_;
   }
 
-  class ChromeClient& ChromeClient() const override {
+  class ChromeClient& GetChromeClient() const override {
     return *chrome_client_.Get();
   }
 
   // Returns the currently active WebInputMethodController which is the one
   // corresponding to the focused frame. It will return nullptr if there is no
   // focused frame, or if the there is one but it belongs to a different local
   // root.
   WebInputMethodController* GetActiveWebInputMethodController() const;
 
   void SetLastHiddenPagePopup(WebPagePopupImpl* page_popup) override {
@@ skipping 86 matching lines @@
   void DetachCompositorAnimationTimeline(CompositorAnimationTimeline*);
 
   LocalFrame* FocusedLocalFrameInWidget() const;
   LocalFrame* FocusedLocalFrameAvailableForIme() const;
 
   CompositorMutatorImpl& Mutator();
 
   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_;
   StorageClientImpl storage_client_impl_;
 
   WebSize size_;
   // If true, automatically resize the layout view around its content.
   bool should_auto_resize_;
   // The lower bound on the size when auto-resizing.
   IntSize min_auto_size_;
@@ skipping 126 matching lines @@
   Persistent<ResizeViewportAnchor> resize_viewport_anchor_;
 };
 
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 }  // namespace blink
 
 #endif