Do not send the UpdateBrowserControlsState before CreateView.

If the UpdateBrowserControlsState is sent before the view (and main
frame) are created then it won't go anywhere.

Ensure the disabling of browser controls state occurs after the main
is created by adding a WebContentsObserver.

BUG=1158712

Change-Id: I96dca9b47381291769a6727ad973656559a6701d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2613151Reviewed-by: Shakti Sahu <shaktisahu@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841055}

components/thin_webview/internal/thin_webview.cc

@@ -47,6 +47,17 @@ void ThinWebView::Destroy(JNIEnv* env, const JavaParamRef<jobject>& object) {
   delete this;
 }
 
+void ThinWebView::RenderFrameCreated(
+    content::RenderFrameHost* render_frame_host) {
+  // Only update the browser controls state for the main frame.
+  if (render_frame_host->GetParent())
+    return;
+  // Disable browser controls when used for thin webview.
+  render_frame_host->UpdateBrowserControlsState(
+      cc::BrowserControlsState::kHidden, cc::BrowserControlsState::kHidden,
+      false);
+}
+
 void ThinWebView::SetWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
@@ -65,6 +76,7 @@ void ThinWebView::SetWebContents(content::WebContents* web_contents,
                                  WebContentsDelegateAndroid* delegate) {
   DCHECK(web_contents);
   web_contents_ = web_contents;
+  Observe(web_contents_);
   ui::ViewAndroid* view_android = web_contents_->GetNativeView();
   if (view_android->parent() != window_android_) {
     window_android_->AddChild(view_android);
@@ -77,11 +89,6 @@ void ThinWebView::SetWebContents(content::WebContents* web_contents,
     web_contents->SetDelegate(delegate);
 
   ThinWebViewInitializer::GetInstance()->AttachTabHelpers(web_contents);
-
-  // Disable browser controls when used for thin webview.
-  web_contents->GetMainFrame()->UpdateBrowserControlsState(
-      cc::BrowserControlsState::kHidden, cc::BrowserControlsState::kHidden,
-      false);
 }
 
 void ThinWebView::SizeChanged(JNIEnv* env,

components/thin_webview/internal/thin_webview.h

@@ -12,6 +12,7 @@
 #include "base/macros.h"
 #include "components/thin_webview/internal/compositor_view_impl.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "ui/android/window_android.h"
 
 namespace web_contents_delegate_android {
@@ -22,13 +23,13 @@ namespace thin_webview {
 namespace android {
 
 // Native counterpart of ThinWebViewImpl.java.
-class ThinWebView {
+class ThinWebView : public content::WebContentsObserver {
  public:
   ThinWebView(JNIEnv* env,
               jobject obj,
               CompositorView* compositor_view,
               ui::WindowAndroid* window_android);
-  ~ThinWebView();
+  ~ThinWebView() override;
 
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& object);
 
@@ -44,6 +45,9 @@ class ThinWebView {
                    jint height);
 
  private:
+  // content::WebContentsObserver overrides:
+  void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
+
   void SetWebContents(
       content::WebContents* web_contents,
       web_contents_delegate_android::WebContentsDelegateAndroid* delegate);