Window Delegate Improvements:

- Windows now must have a Delegate. Just construct the default WindowDelegate
if
you don't want to have to write one in testing.
- Windows now obtain their contents view by asking the delegate via
WindowDelegate::GetContentsView.
- Contents views no longer need to manually store a pointer to the Window that
contains them, WindowDelegate does this automatically via its window()
accessor.

Reviewer notes:
- review window_delegate.h first, then
- window.h/cc
- custom frame window.h/cc
- constrained_window_impl.h/cc
- then everything else (just updating all call sites)

B=1280060

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 27 deletions

diff --git a/chrome/browser/browser_commands.cc b/chrome/browser/browser_commands.cc
index 0d65b0b..3b5d201 100644
--- a/chrome/browser/browser_commands.cc
+++ b/chrome/browser/browser_commands.cc
@@ -546,14 +546,10 @@ void Browser::ExecuteCommand(int id) {
 
     case IDC_ABOUT: {
       UserMetrics::RecordAction(L"AboutChrome", profile_);
-      AboutChromeView* about_view = new AboutChromeView(profile_);
-      ChromeViews::Window* about_dialog =
-          ChromeViews::Window::CreateChromeWindow(GetTopLevelHWND(),
-                                                  gfx::Rect(),
-                                                  about_view,
-                                                  about_view);
-      about_dialog->Show();
-      about_view->SetDialog(about_dialog);
+      ChromeViews::Window::CreateChromeWindow(
+          GetTopLevelHWND(),
+          gfx::Rect(),
+          new AboutChromeView(profile_))->Show();
       break;
     }
 
@@ -944,12 +940,8 @@ void Browser::OpenKeywordEditor() {
 }
 
 void Browser::OpenImportSettingsDialog() {
-  ImporterView* importer_view = new ImporterView(profile_);
-  ChromeViews::Window* importer_dialog =
-      ChromeViews::Window::CreateChromeWindow(GetTopLevelHWND(), gfx::Rect(),
-                                              importer_view, importer_view);
-  importer_dialog->Show();
-  importer_view->set_dialog(importer_dialog);
+  ChromeViews::Window::CreateChromeWindow(GetTopLevelHWND(), gfx::Rect(),
+                                          new ImporterView(profile_))->Show();
 }
 
 void Browser::OpenBugReportDialog() {
@@ -988,22 +980,15 @@ void Browser::OpenBugReportDialog() {
   bug_report_view->set_png_data(screenshot_png);
 
   // Create and show the dialog
-  ChromeViews::Window* bug_report_dialog =
-      ChromeViews::Window::CreateChromeWindow(GetTopLevelHWND(), gfx::Rect(),
-                                              bug_report_view, bug_report_view);
-  bug_report_dialog->Show();
-  bug_report_view->set_dialog(bug_report_dialog);
+  ChromeViews::Window::CreateChromeWindow(GetTopLevelHWND(), gfx::Rect(),
+                                          bug_report_view)->Show();
 }
 
 void Browser::OpenClearBrowsingDataDialog() {
-  ClearBrowsingDataView* clear_browsing_data_view =
-      new ClearBrowsingDataView(profile_);
-  ChromeViews::Window* clear_browsing_data_dialog =
-      ChromeViews::Window::CreateChromeWindow(
-          GetTopLevelHWND(), gfx::Rect(),
-          clear_browsing_data_view, clear_browsing_data_view);
-  clear_browsing_data_dialog->Show();
-  clear_browsing_data_view->SetDialog(clear_browsing_data_dialog);
+    ChromeViews::Window::CreateChromeWindow(
+        GetTopLevelHWND(),
+        gfx::Rect(),
+        new ClearBrowsingDataView(profile_))->Show();
 }
 
 void Browser::RunSimpleFrameMenu(const CPoint& pt, HWND hwnd) {