Convert more users away from DOMView.

chrome/browser/printing/print_dialog_cloud.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_registrar.h"
@@ skipping 647 matching lines @@
   }
 
   int width = pref_service->GetInteger(prefs::kCloudPrintDialogWidth);
   int height = pref_service->GetInteger(prefs::kCloudPrintDialogHeight);
 
   HtmlDialogUIDelegate* dialog_delegate =
       new internal_cloud_print_helpers::CloudPrintHtmlDialogDelegate(
           path_to_file, width, height, std::string(), job_title, print_ticket,
           file_type, modal, delete_on_close, close_after_signin,
           callback);
-  if (modal) {
-    DCHECK(browser);
 
-#if defined(USE_AURA)
-    HtmlDialogView* html_view =
-        new HtmlDialogView(profile, browser, dialog_delegate);
-    views::Widget::CreateWindowWithParent(html_view,
-        browser->window()->GetNativeHandle());
-    html_view->InitDialog();
-    views::Widget* widget = html_view->GetWidget();
-    DCHECK(widget);
-    widget->Show();
 #if defined(OS_WIN)

[sky, 2012/04/20 22:59:37]

Oy, what an ifdef soup.

[Albert Bodenhamer, 2012/04/21 00:19:48]

Yep.  The joys of needing to hack window focus on Windows combined with other
platforms that throw warnings if |window| is assigned but not used.

I can think of a few ways to restructure this, but they really aren't any
better. :-/

-    gfx::NativeWindow window = widget->GetNativeWindow();
+  gfx::NativeWindow window =
 #endif
-#else
-#if defined(OS_WIN)
-    gfx::NativeWindow window =
-#endif
-        browser->BrowserShowHtmlDialog(dialog_delegate, NULL, STYLE_GENERIC);
-#endif
+      browser::ShowHtmlDialog(
+          modal ? browser->window()->GetNativeHandle() : NULL,
+          profile,
+          browser,
+          dialog_delegate,
+          STYLE_GENERIC);
+
 #if defined(OS_WIN)
     HWND dialog_handle;
 #if defined(USE_AURA)
     dialog_handle = window->GetRootWindow()->GetAcceleratedWidget();
 #else
     dialog_handle = window;
 #endif
-    if (::GetForegroundWindow() != dialog_handle) {
+    if (::GetForegroundWindow() != dialog_handle)
       ui::ForegroundHelper::SetForeground(dialog_handle);
-    }
 #endif
-  } else {
-    browser::ShowHtmlDialog(NULL,
-                            profile,
-                            browser,
-                            dialog_delegate,
-                            STYLE_GENERIC);
-  }
 }
 
 void CreateDialogSigninImpl(const base::Closure& callback) {
   CreateDialogImpl(FilePath(), string16(), string16(), std::string(),
                    true, false, true, callback);
 }
 
 void CreateDialogFullImpl(const FilePath& path_to_file,
                       const string16& print_job_title,
                       const string16& print_ticket,
@@ skipping 96 matching lines @@
                                                    file_type,
                                                    false,
                                                    delete_on_close);
       return true;
     }
   }
   return false;
 }
 
 }  // end namespace