Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1162)

Side by Side Diff: chrome/browser/chromeos/login/login_html_dialog.cc

Issue 10204002: Revert 133467 - Convert the last users of DOMView to WebView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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 views::Widget::CreateWindowWithParent( 59 HtmlDialogView* html_view =
60 new HtmlDialogView(ProfileManager::GetDefaultProfile(), NULL, this), 60 new HtmlDialogView(ProfileManager::GetDefaultProfile(), NULL, this);
61 parent_window_)->Show(); 61 views::Widget::CreateWindowWithParent(html_view, parent_window_);
62 html_view->InitDialog();
63 html_view->GetWidget()->Show();
62 is_open_ = true; 64 is_open_ = true;
63 } 65 }
64 66
65 void LoginHtmlDialog::SetDialogSize(int width, int height) { 67 void LoginHtmlDialog::SetDialogSize(int width, int height) {
66 DCHECK(width >= 0 && height >= 0); 68 DCHECK(width >= 0 && height >= 0);
67 width_ = width; 69 width_ = width;
68 height_ = height; 70 height_ = height;
69 } 71 }
70 72
71 void LoginHtmlDialog::SetDialogTitle(const string16& title) { 73 void LoginHtmlDialog::SetDialogTitle(const string16& title) {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 126
125 void LoginHtmlDialog::Observe(int type, 127 void LoginHtmlDialog::Observe(int type,
126 const content::NotificationSource& source, 128 const content::NotificationSource& source,
127 const content::NotificationDetails& details) { 129 const content::NotificationDetails& details) {
128 DCHECK(type == content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME); 130 DCHECK(type == content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME);
129 // TODO(saintlou): Do we need a throbber for Aura? 131 // TODO(saintlou): Do we need a throbber for Aura?
130 NOTIMPLEMENTED(); 132 NOTIMPLEMENTED();
131 } 133 }
132 134
133 } // namespace chromeos 135 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/html_page_screen.cc ('k') | chrome/browser/chromeos/login/registration_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698