Moved shell initialization to AddedToWidget()

Previously ShellWindowDelegateView had its initialization happen in
ViewHierarchyChanged(). This change splits initialization between the
constructor and AddedToWidget().

This allows the ShellWindowDelegateView to support being re-parented
to a Widget hierarchy multiple times.

Bug: 1083822
Change-Id: I4e0da0bcf458683bea2d327613588754c7372945
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2206218
Commit-Queue: Thomas Lukaszewicz <tluk@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771077}

content/shell/browser/shell_platform_delegate_views.cc

@@ -78,7 +78,9 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
  public:
   enum UIControl { BACK_BUTTON, FORWARD_BUTTON, STOP_BUTTON };
 
-  ShellWindowDelegateView(Shell* shell) : shell_(shell) {}
+  explicit ShellWindowDelegateView(Shell* shell) : shell_(shell) {
+    InitShellWindow();
+  }
 
   ~ShellWindowDelegateView() override {}
 
@@ -222,10 +224,10 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
 
     if (!Shell::ShouldHideToolbar())
       layout->AddPaddingRow(0, 5);
-
-    InitAccelerators();
   }
   void InitAccelerators() {
+    // This function must be called when part of the widget hierarchy.
+    DCHECK(GetWidget());
     static const ui::KeyboardCode keys[] = {ui::VKEY_F5, ui::VKEY_BROWSER_BACK,
                                             ui::VKEY_BROWSER_FORWARD};
     for (size_t i = 0; i < base::size(keys); ++i) {
@@ -277,12 +279,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
     // (preferred) size.
     return gfx::Size();
   }
-  void ViewHierarchyChanged(
-      const views::ViewHierarchyChangedDetails& details) override {
-    if (details.is_add && details.child == this) {
-      InitShellWindow();
-    }
-  }
+  void AddedToWidget() override { InitAccelerators(); }
 
   // Overridden from AcceleratorTarget:
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override {

weblayer/shell/browser/shell_views.cc

@@ -54,7 +54,9 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
  public:
   enum UIControl { BACK_BUTTON, FORWARD_BUTTON, STOP_BUTTON };
 
-  ShellWindowDelegateView(Shell* shell) : shell_(shell) {}
+  explicit ShellWindowDelegateView(Shell* shell) : shell_(shell) {
+    InitShellWindow();
+  }
 
   ~ShellWindowDelegateView() override {}
 
@@ -194,11 +196,11 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
     }
 
     layout->AddPaddingRow(0, 5);
-
-    InitAccelerators();
   }
 
   void InitAccelerators() {
+    // This function must be called when part of the widget hierarchy.
+    DCHECK(GetWidget());
     static const ui::KeyboardCode keys[] = {ui::VKEY_F5, ui::VKEY_BROWSER_BACK,
                                             ui::VKEY_BROWSER_FORWARD};
     for (size_t i = 0; i < base::size(keys); ++i) {
@@ -252,12 +254,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
     // (preferred) size.
     return gfx::Size();
   }
-  void ViewHierarchyChanged(
-      const views::ViewHierarchyChangedDetails& details) override {
-    if (details.is_add && details.child == this) {
-      InitShellWindow();
-    }
-  }
+  void AddedToWidget() override { InitAccelerators(); }
 
   // Overridden from AcceleratorTarget:
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override {