OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/login_html_dialog.h" | 5 #include "chrome/browser/chromeos/login/login_html_dialog.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/chromeos/frame/bubble_frame_view.h" | 8 #include "chrome/browser/chromeos/frame/bubble_frame_view.h" |
9 #include "chrome/browser/chromeos/frame/bubble_window.h" | 9 #include "chrome/browser/chromeos/frame/bubble_window.h" |
10 #include "chrome/browser/chromeos/login/helper.h" | 10 #include "chrome/browser/chromeos/login/helper.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 void LoginHtmlDialog::Show() { | 54 void LoginHtmlDialog::Show() { |
55 HtmlDialogView* html_view = | 55 HtmlDialogView* html_view = |
56 new HtmlDialogView(ProfileManager::GetDefaultProfile(), this); | 56 new HtmlDialogView(ProfileManager::GetDefaultProfile(), this); |
57 #if defined(USE_AURA) | 57 #if defined(USE_AURA) |
58 // TODO(saintlou): Until the new Bubble have been landed. | 58 // TODO(saintlou): Until the new Bubble have been landed. |
59 views::Widget::CreateWindowWithParent(html_view, parent_window_); | 59 views::Widget::CreateWindowWithParent(html_view, parent_window_); |
60 html_view->InitDialog(); | 60 html_view->InitDialog(); |
61 #else | 61 #else |
62 if (style_ & STYLE_BUBBLE) { | 62 if (style_ & STYLE_BUBBLE) { |
63 views::Widget* bubble_window = BubbleWindow::Create(parent_window_, | 63 views::Widget* bubble_window = BubbleWindow::Create(parent_window_, |
64 static_cast<BubbleWindowStyle>(STYLE_XBAR | STYLE_THROBBER), | 64 static_cast<DialogStyle>(STYLE_XBAR | STYLE_THROBBER), |
65 html_view); | 65 html_view); |
66 bubble_frame_view_ = static_cast<BubbleFrameView*>( | 66 bubble_frame_view_ = static_cast<BubbleFrameView*>( |
67 bubble_window->non_client_view()->frame_view()); | 67 bubble_window->non_client_view()->frame_view()); |
68 } else { | 68 } else { |
69 views::Widget::CreateWindowWithParent(html_view, parent_window_); | 69 views::Widget::CreateWindowWithParent(html_view, parent_window_); |
70 } | 70 } |
71 html_view->InitDialog(); | 71 html_view->InitDialog(); |
72 if (bubble_frame_view_) { | 72 if (bubble_frame_view_) { |
73 bubble_frame_view_->StartThrobber(); | 73 bubble_frame_view_->StartThrobber(); |
74 notification_registrar_.Add( | 74 notification_registrar_.Add( |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 #if defined(USE_AURA) | 143 #if defined(USE_AURA) |
144 // TODO(saintlou): Do we need a throbber for Aura? | 144 // TODO(saintlou): Do we need a throbber for Aura? |
145 NOTIMPLEMENTED(); | 145 NOTIMPLEMENTED(); |
146 #else | 146 #else |
147 if (bubble_frame_view_) | 147 if (bubble_frame_view_) |
148 bubble_frame_view_->StopThrobber(); | 148 bubble_frame_view_->StopThrobber(); |
149 #endif | 149 #endif |
150 } | 150 } |
151 | 151 |
152 } // namespace chromeos | 152 } // namespace chromeos |
OLD | NEW |