| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/cocoa/apps/native_app_window_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/mac/foundation_util.h" | 8 #include "base/mac/foundation_util.h" |
| 9 #include "base/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
| 10 #include "base/mac/sdk_forward_declarations.h" | 10 #include "base/mac/sdk_forward_declarations.h" |
| (...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 UpdateDraggableRegionViews(); | 553 UpdateDraggableRegionViews(); |
| 554 } | 554 } |
| 555 | 555 |
| 556 SkRegion* NativeAppWindowCocoa::GetDraggableRegion() { | 556 SkRegion* NativeAppWindowCocoa::GetDraggableRegion() { |
| 557 return NULL; | 557 return NULL; |
| 558 } | 558 } |
| 559 | 559 |
| 560 void NativeAppWindowCocoa::HandleKeyboardEvent( | 560 void NativeAppWindowCocoa::HandleKeyboardEvent( |
| 561 const content::NativeWebKeyboardEvent& event) { | 561 const content::NativeWebKeyboardEvent& event) { |
| 562 if (event.skip_in_browser || | 562 if (event.skip_in_browser || |
| 563 event.type == content::NativeWebKeyboardEvent::Char) { | 563 event.type() == content::NativeWebKeyboardEvent::Char) { |
| 564 return; | 564 return; |
| 565 } | 565 } |
| 566 [window() redispatchKeyEvent:event.os_event]; | 566 [window() redispatchKeyEvent:event.os_event]; |
| 567 } | 567 } |
| 568 | 568 |
| 569 void NativeAppWindowCocoa::UpdateDraggableRegionViews() { | 569 void NativeAppWindowCocoa::UpdateDraggableRegionViews() { |
| 570 if (has_frame_) | 570 if (has_frame_) |
| 571 return; | 571 return; |
| 572 | 572 |
| 573 // All ControlRegionViews should be added as children of the WebContentsView, | 573 // All ControlRegionViews should be added as children of the WebContentsView, |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 832 } | 832 } |
| 833 | 833 |
| 834 void NativeAppWindowCocoa::UpdateRestoredBounds() { | 834 void NativeAppWindowCocoa::UpdateRestoredBounds() { |
| 835 if (IsRestored(*this)) | 835 if (IsRestored(*this)) |
| 836 restored_bounds_ = [window() frame]; | 836 restored_bounds_ = [window() frame]; |
| 837 } | 837 } |
| 838 | 838 |
| 839 void NativeAppWindowCocoa::HideWithoutMarkingHidden() { | 839 void NativeAppWindowCocoa::HideWithoutMarkingHidden() { |
| 840 [window() orderOut:window_controller_]; | 840 [window() orderOut:window_controller_]; |
| 841 } | 841 } |
| OLD | NEW |