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