OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/login/helper.h" | 8 #include "chrome/browser/chromeos/login/helper.h" |
9 #include "chrome/browser/profiles/profile_manager.h" | 9 #include "chrome/browser/profiles/profile_manager.h" |
10 #include "chrome/browser/ui/views/html_dialog_view.h" | 10 #include "chrome/browser/ui/views/html_dialog_view.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); | 49 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); |
50 width_ = static_cast<int>(kDefaultWidthRatio * screen_bounds.width()); | 50 width_ = static_cast<int>(kDefaultWidthRatio * screen_bounds.width()); |
51 height_ = static_cast<int>(kDefaultHeightRatio * screen_bounds.height()); | 51 height_ = static_cast<int>(kDefaultHeightRatio * screen_bounds.height()); |
52 } | 52 } |
53 | 53 |
54 LoginHtmlDialog::~LoginHtmlDialog() { | 54 LoginHtmlDialog::~LoginHtmlDialog() { |
55 delegate_ = NULL; | 55 delegate_ = NULL; |
56 } | 56 } |
57 | 57 |
58 void LoginHtmlDialog::Show() { | 58 void LoginHtmlDialog::Show() { |
59 HtmlDialogView* html_view = | 59 views::Widget::CreateWindowWithParent( |
60 new HtmlDialogView(ProfileManager::GetDefaultProfile(), NULL, this); | 60 new HtmlDialogView(ProfileManager::GetDefaultProfile(), NULL, this), |
61 views::Widget::CreateWindowWithParent(html_view, parent_window_); | 61 parent_window_)->Show(); |
62 html_view->InitDialog(); | |
63 html_view->GetWidget()->Show(); | |
64 is_open_ = true; | 62 is_open_ = true; |
65 } | 63 } |
66 | 64 |
67 void LoginHtmlDialog::SetDialogSize(int width, int height) { | 65 void LoginHtmlDialog::SetDialogSize(int width, int height) { |
68 DCHECK(width >= 0 && height >= 0); | 66 DCHECK(width >= 0 && height >= 0); |
69 width_ = width; | 67 width_ = width; |
70 height_ = height; | 68 height_ = height; |
71 } | 69 } |
72 | 70 |
73 void LoginHtmlDialog::SetDialogTitle(const string16& title) { | 71 void LoginHtmlDialog::SetDialogTitle(const string16& title) { |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 | 124 |
127 void LoginHtmlDialog::Observe(int type, | 125 void LoginHtmlDialog::Observe(int type, |
128 const content::NotificationSource& source, | 126 const content::NotificationSource& source, |
129 const content::NotificationDetails& details) { | 127 const content::NotificationDetails& details) { |
130 DCHECK(type == content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME); | 128 DCHECK(type == content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME); |
131 // TODO(saintlou): Do we need a throbber for Aura? | 129 // TODO(saintlou): Do we need a throbber for Aura? |
132 NOTIMPLEMENTED(); | 130 NOTIMPLEMENTED(); |
133 } | 131 } |
134 | 132 |
135 } // namespace chromeos | 133 } // namespace chromeos |
OLD | NEW |