Rename ExtensionView::DidStopLoading() to OnLoaded()

ExtensionView::DidStopLoading() collided with
content::WebContentsObserver::DidStopLoading().

BUG=818397
TBR=rdevlin.cronin@chromium.org
Method rename.

Change-Id: I15ea2074f7c430429d2538ef19c858cb74f549b3
Reviewed-on: https://chromium-review.googlesource.com/954065
Commit-Queue: Robert Liao <robliao@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542049}

chrome/browser/extensions/extension_view.h

@@ -47,7 +47,7 @@ class ExtensionView {
       const content::NativeWebKeyboardEvent& event) = 0;
 
   // Method for the ExtensionHost to notify that the extension page has loaded.
-  virtual void DidStopLoading() = 0;
+  virtual void OnLoaded() = 0;
 };
 
 }  // namespace extensions

chrome/browser/extensions/extension_view_host.cc

@@ -114,7 +114,7 @@ void ExtensionViewHost::UnhandledKeyboardEvent(
 // ExtensionHost overrides:
 
 void ExtensionViewHost::OnDidStopFirstLoad() {
-  view_->DidStopLoading();
+  view_->OnLoaded();
 }
 
 void ExtensionViewHost::LoadInitialURL() {

chrome/browser/ui/cocoa/extensions/extension_view_mac.h

@@ -62,7 +62,7 @@ class ExtensionViewMac : public extensions::ExtensionView {
   void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;
-  void DidStopLoading() override;
+  void OnLoaded() override;
 
  private:
   content::RenderViewHost* render_view_host() const;

chrome/browser/ui/cocoa/extensions/extension_view_mac.mm

@@ -82,7 +82,7 @@ void ExtensionViewMac::HandleKeyboardEvent(
   [event_window redispatchKeyEvent:event.os_event];
 }
 
-void ExtensionViewMac::DidStopLoading() {
+void ExtensionViewMac::OnLoaded() {
   ShowIfCompletelyLoaded();
 }
 

chrome/browser/ui/views/extensions/extension_view_views.cc

@@ -107,14 +107,16 @@ void ExtensionViewViews::HandleKeyboardEvent(
                                                         GetFocusManager());
 }
 
-void ExtensionViewViews::DidStopLoading() {
-  // We wait to show the ExtensionViewViews until it has loaded, and the view
-  // has actually been created. These can happen in different orders.
-  // TODO(devlin): Can they? Isn't the view created during construction?
-  if (!visible() && host_->has_loaded_once()) {
-    SetVisible(true);
-    ResizeDueToAutoResize(web_contents(), pending_preferred_size_);
-  }
+void ExtensionViewViews::OnLoaded() {
+  DCHECK(host_->has_loaded_once());
+
+  // ExtensionPopup delegates showing the view to OnLoaded(). ExtensionDialog
+  // handles visibility directly.
+  if (visible())
+    return;
+
+  SetVisible(true);
+  ResizeDueToAutoResize(web_contents(), pending_preferred_size_);
 }
 
 gfx::NativeCursor ExtensionViewViews::GetCursor(const ui::MouseEvent& event) {

chrome/browser/ui/views/extensions/extension_view_views.h

@@ -60,7 +60,7 @@ class ExtensionViewViews : public views::WebView,
   void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;
-  void DidStopLoading() override;
+  void OnLoaded() override;
 
   // views::WebView:
   gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override;