| 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 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" | 5 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/scoped_nsobject.h" | 8 #include "base/memory/scoped_nsobject.h" |
| 9 #include "base/property_bag.h" | 9 #include "base/property_bag.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #import "chrome/browser/ui/browser_dialogs.h" | 13 #import "chrome/browser/ui/browser_dialogs.h" |
| 14 #import "chrome/browser/ui/cocoa/browser_command_executor.h" | 14 #import "chrome/browser/ui/cocoa/browser_command_executor.h" |
| 15 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 15 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
| 16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 17 #include "chrome/browser/ui/webui/web_dialog_controller.h" | 17 #include "chrome/browser/ui/webui/web_dialog_controller.h" |
| 18 #include "chrome/browser/ui/webui/web_dialog_delegate.h" | |
| 19 #include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h" | 18 #include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h" |
| 20 #include "content/public/browser/native_web_keyboard_event.h" | 19 #include "content/public/browser/native_web_keyboard_event.h" |
| 21 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
| 22 #include "content/public/browser/web_ui_message_handler.h" | 21 #include "content/public/browser/web_ui_message_handler.h" |
| 23 #include "ui/base/keycodes/keyboard_codes.h" | 22 #include "ui/base/keycodes/keyboard_codes.h" |
| 24 #include "ui/gfx/size.h" | 23 #include "ui/gfx/size.h" |
| 24 #include "ui/web_dialogs/web_dialog_delegate.h" |
| 25 | 25 |
| 26 using content::NativeWebKeyboardEvent; | 26 using content::NativeWebKeyboardEvent; |
| 27 using content::WebContents; | 27 using content::WebContents; |
| 28 using content::WebUIMessageHandler; | 28 using content::WebUIMessageHandler; |
| 29 using ui::WebDialogDelegate; |
| 30 using ui::WebDialogUI; |
| 29 | 31 |
| 30 // Thin bridge that routes notifications to | 32 // Thin bridge that routes notifications to |
| 31 // WebDialogWindowController's member variables. | 33 // WebDialogWindowController's member variables. |
| 32 class WebDialogWindowDelegateBridge | 34 class WebDialogWindowDelegateBridge |
| 33 : public WebDialogDelegate, | 35 : public WebDialogDelegate, |
| 34 public WebDialogWebContentsDelegate { | 36 public WebDialogWebContentsDelegate { |
| 35 public: | 37 public: |
| 36 // All parameters must be non-NULL/non-nil. | 38 // All parameters must be non-NULL/non-nil. |
| 37 WebDialogWindowDelegateBridge(WebDialogWindowController* controller, | 39 WebDialogWindowDelegateBridge(WebDialogWindowController* controller, |
| 38 Profile* profile, | 40 Profile* profile, |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 // TODO(akalin): Figure out why implementing (void)cancel:(id)sender | 373 // TODO(akalin): Figure out why implementing (void)cancel:(id)sender |
| 372 // to do the above doesn't work. | 374 // to do the above doesn't work. |
| 373 } | 375 } |
| 374 | 376 |
| 375 - (void)windowWillClose:(NSNotification*)notification { | 377 - (void)windowWillClose:(NSNotification*)notification { |
| 376 delegate_->WindowControllerClosed(); | 378 delegate_->WindowControllerClosed(); |
| 377 [self autorelease]; | 379 [self autorelease]; |
| 378 } | 380 } |
| 379 | 381 |
| 380 @end | 382 @end |
| OLD | NEW |