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 <Carbon/Carbon.h> | 5 #import <Carbon/Carbon.h> |
6 | 6 |
7 #import "content/browser/web_contents/web_contents_view_mac.h" | 7 #import "content/browser/web_contents/web_contents_view_mac.h" |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
399 // when the "zoom" button in the browser window is clicked. | 399 // when the "zoom" button in the browser window is clicked. |
400 host->EnablePreferredSizeMode(); | 400 host->EnablePreferredSizeMode(); |
401 } | 401 } |
402 | 402 |
403 void WebContentsViewMac::RenderViewSwappedIn(RenderViewHost* host) { | 403 void WebContentsViewMac::RenderViewSwappedIn(RenderViewHost* host) { |
404 } | 404 } |
405 | 405 |
406 void WebContentsViewMac::SetOverscrollControllerEnabled(bool enabled) { | 406 void WebContentsViewMac::SetOverscrollControllerEnabled(bool enabled) { |
407 } | 407 } |
408 | 408 |
| 409 ui::Compositor* WebContentsViewMac::GetCompositor() const { |
| 410 return nullptr; |
| 411 } |
| 412 |
409 bool WebContentsViewMac::IsEventTracking() const { | 413 bool WebContentsViewMac::IsEventTracking() const { |
410 return base::MessagePumpMac::IsHandlingSendEvent(); | 414 return base::MessagePumpMac::IsHandlingSendEvent(); |
411 } | 415 } |
412 | 416 |
413 // Arrange to call CloseTab() after we're back to the main event loop. | 417 // Arrange to call CloseTab() after we're back to the main event loop. |
414 // The obvious way to do this would be PostNonNestableTask(), but that | 418 // The obvious way to do this would be PostNonNestableTask(), but that |
415 // will fire when the event-tracking loop polls for events. So we | 419 // will fire when the event-tracking loop polls for events. So we |
416 // need to bounce the message via Cocoa, instead. | 420 // need to bounce the message via Cocoa, instead. |
417 void WebContentsViewMac::CloseTabAfterEventTracking() { | 421 void WebContentsViewMac::CloseTabAfterEventTracking() { |
418 [cocoa_view_ cancelDeferredClose]; | 422 [cocoa_view_ cancelDeferredClose]; |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
718 | 722 |
719 - (void)viewDidHide { | 723 - (void)viewDidHide { |
720 [self updateWebContentsVisibility]; | 724 [self updateWebContentsVisibility]; |
721 } | 725 } |
722 | 726 |
723 - (void)viewDidUnhide { | 727 - (void)viewDidUnhide { |
724 [self updateWebContentsVisibility]; | 728 [self updateWebContentsVisibility]; |
725 } | 729 } |
726 | 730 |
727 @end | 731 @end |
OLD | NEW |