Use BubbleWindow for ChromeOS windows/dialogs.

chrome/browser/views/js_modal_dialog_views.cc

 // Copyright (c) 2010 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/views/js_modal_dialog_views.h"
 
 #include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "chrome/browser/app_modal_dialog.h"
+#include "chrome/browser/views/window.h"
 #include "grit/generated_resources.h"
 #include "views/controls/message_box_view.h"
 #include "views/window/window.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/frame/bubble_window.h"
-#endif  // defined(OS_CHROMEOS)
-
 ////////////////////////////////////////////////////////////////////////////////
 // JSModalDialogViews, public:
 
 JSModalDialogViews::JSModalDialogViews(
     JavaScriptAppModalDialog* parent)
     : parent_(parent),
       message_box_view_(new MessageBoxView(
           parent->dialog_flags() | MessageBoxFlags::kAutoDetectAlignment,
           parent->message_text(), parent->default_prompt_text())) {
   DCHECK(message_box_view_);
@@ skipping 117 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeAppModalDialog, public:
 
 // static
 NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
     JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent_window) {
   JSModalDialogViews* d = new JSModalDialogViews(dialog);
 
-#if defined(OS_CHROMEOS)
-  // Use bubble frame for JS dialog on ChromeOS.
-  chromeos::BubbleWindow::Create(parent_window, gfx::Rect(), d);
-#else
-  views::Window::CreateChromeWindow(parent_window, gfx::Rect(), d);
-#endif
-
+  browser::CreateViewsWindow(parent_window, gfx::Rect(), d);
   return d;
 }