Componentize Constrained Window Views

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
index 2623ae5a5a2d51c5a8f515d65d2315b4049951a5..6eb9dcc1f5ba1bb527ab841eab3fab528e0d94df 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -4,7 +4,9 @@
 
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 
+#include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
+#include "components/constrained_window/constrained_window_views.h"
 
 #if defined(USE_AURA)
 #include "ui/wm/core/wm_state.h"
@@ -14,6 +16,7 @@ ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
 }
 
 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {
+  SetConstrainedWindowViewsClient(scoped_ptr<ConstrainedWindowViewsClient>());
 }
 
 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
@@ -22,6 +25,8 @@ void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
   if (!views::ViewsDelegate::views_delegate)
     views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
 
+  SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
+
 #if defined(USE_AURA)
   wm_state_.reset(new wm::WMState);
 #endif