| 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 // going on. | 325 // going on. |
| 326 [cocoa_view_.get() setNextKeyView:view_view]; | 326 [cocoa_view_.get() setNextKeyView:view_view]; |
| 327 return view; | 327 return view; |
| 328 } | 328 } |
| 329 | 329 |
| 330 RenderWidgetHostView* WebContentsViewMac::CreateViewForPopupWidget( | 330 RenderWidgetHostView* WebContentsViewMac::CreateViewForPopupWidget( |
| 331 RenderWidgetHost* render_widget_host) { | 331 RenderWidgetHost* render_widget_host) { |
| 332 return RenderWidgetHostViewPort::CreateViewForWidget(render_widget_host); | 332 return RenderWidgetHostViewPort::CreateViewForWidget(render_widget_host); |
| 333 } | 333 } |
| 334 | 334 |
| 335 void WebContentsViewMac::SetPageTitle(const string16& title) { | 335 void WebContentsViewMac::SetPageTitle(const base::string16& title) { |
| 336 // Meaningless on the Mac; widgets don't have a "title" attribute | 336 // Meaningless on the Mac; widgets don't have a "title" attribute |
| 337 } | 337 } |
| 338 | 338 |
| 339 | 339 |
| 340 void WebContentsViewMac::RenderViewCreated(RenderViewHost* host) { | 340 void WebContentsViewMac::RenderViewCreated(RenderViewHost* host) { |
| 341 // We want updates whenever the intrinsic width of the webpage changes. | 341 // We want updates whenever the intrinsic width of the webpage changes. |
| 342 // Put the RenderView into that mode. The preferred width is used for example | 342 // Put the RenderView into that mode. The preferred width is used for example |
| 343 // when the "zoom" button in the browser window is clicked. | 343 // when the "zoom" button in the browser window is clicked. |
| 344 host->EnablePreferredSizeMode(); | 344 host->EnablePreferredSizeMode(); |
| 345 } | 345 } |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 [[[notification userInfo] objectForKey:kSelectionDirection] | 567 [[[notification userInfo] objectForKey:kSelectionDirection] |
| 568 unsignedIntegerValue]; | 568 unsignedIntegerValue]; |
| 569 if (direction == NSDirectSelection) | 569 if (direction == NSDirectSelection) |
| 570 return; | 570 return; |
| 571 | 571 |
| 572 [self webContents]-> | 572 [self webContents]-> |
| 573 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 573 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
| 574 } | 574 } |
| 575 | 575 |
| 576 @end | 576 @end |
| OLD | NEW |