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/ui/views/html_dialog_view.h" | 5 #include "chrome/browser/ui/views/html_dialog_view.h" |
6 | 6 |
| 7 #include <vector> |
| 8 |
7 #include "chrome/browser/tab_contents/tab_contents.h" | 9 #include "chrome/browser/tab_contents/tab_contents.h" |
8 #include "chrome/browser/ui/browser.h" | |
9 #include "chrome/browser/ui/views/window.h" | 10 #include "chrome/browser/ui/views/window.h" |
10 #include "chrome/common/native_web_keyboard_event.h" | 11 #include "chrome/common/native_web_keyboard_event.h" |
11 #include "ui/base/keycodes/keyboard_codes.h" | 12 #include "ui/base/keycodes/keyboard_codes.h" |
12 #include "views/widget/root_view.h" | 13 #include "views/widget/root_view.h" |
13 #include "views/widget/widget.h" | 14 #include "views/widget/widget.h" |
14 #include "views/window/window.h" | 15 #include "views/window/window.h" |
15 | 16 |
16 #if defined(OS_LINUX) | 17 #if defined(OS_LINUX) |
17 #include "views/window/window_gtk.h" | 18 #include "views/window/window_gtk.h" |
18 #endif | 19 #endif |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 // Set the delegate. This must be done before loading the page. See | 212 // Set the delegate. This must be done before loading the page. See |
212 // the comment above HtmlDialogUI in its header file for why. | 213 // the comment above HtmlDialogUI in its header file for why. |
213 HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(), | 214 HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(), |
214 this); | 215 this); |
215 | 216 |
216 // Pressing the ESC key will close the dialog. | 217 // Pressing the ESC key will close the dialog. |
217 AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false)); | 218 AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false)); |
218 | 219 |
219 DOMView::LoadURL(GetDialogContentURL()); | 220 DOMView::LoadURL(GetDialogContentURL()); |
220 } | 221 } |
OLD | NEW |