Promote bubble_window_style to more general dialog_style.

chrome/browser/chromeos/frame/bubble_window.cc

 // Copyright (c) 2011 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/chromeos/frame/bubble_window.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/chromeos/frame/bubble_frame_view.h"
 #include "chrome/browser/chromeos/frame/bubble_window_views.h"
 #include "ui/gfx/skia_utils_gtk.h"
 #include "views/window/non_client_view.h"
 
 namespace chromeos {
 
 BubbleWindow::BubbleWindow(views::Widget* window,
-    BubbleWindowStyle style)
+    DialogStyle style)
     : views::NativeWidgetGtk(window),
       style_(style) {
 }
 
 void BubbleWindow::InitNativeWidget(const views::Widget::InitParams& params) {
 #if defined(USE_AURA)
   // TODO(saintlou): Switch to alicet@chromium.org PureView when landed
 #else
   views::NativeWidgetGtk::InitNativeWidget(params);
 
@@ skipping 17 matching lines @@
 #endif
 }
 
 views::NonClientFrameView* BubbleWindow::CreateNonClientFrameView() {
   views::Widget* window = GetWidget();
   return new BubbleFrameView(window, window->widget_delegate(), style_);
 }
 
 views::Widget* BubbleWindow::Create(
     gfx::NativeWindow parent,
-    BubbleWindowStyle style,
+    DialogStyle style,
     views::WidgetDelegate* widget_delegate) {
 #if defined(USE_AURA)
   // TODO(saintlou):
   return NULL;
 #else
   // TODO(saintlou): Ultimately we do not want 2 classes for BubbleWindows.
   // Furthermore the 2 other styles (STYLE_XBAR & STYLE_THROBBER) are only used
   // in LoginHtmlDialog::Show() which will be deprecated soon.
   if (views::Widget::IsPureViews()) {
     if ((style & STYLE_XBAR) || (style & STYLE_THROBBER))
@@ skipping 15 matching lines @@
   params.native_widget = bubble_window;
   params.parent = GTK_WIDGET(parent);
   params.bounds = gfx::Rect();
   window->Init(params);
 
   return window;
 #endif
 }
 
 }  // namespace chromeos