| 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/tab_contents/tab_contents_view_win.h" | 5 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_win.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 | 276 |
| 277 void TabContentsViewWin::CancelDragAndCloseTab() { | 277 void TabContentsViewWin::CancelDragAndCloseTab() { |
| 278 DCHECK(IsDoingDrag()); | 278 DCHECK(IsDoingDrag()); |
| 279 // We can't close the tab while we're in the drag and | 279 // We can't close the tab while we're in the drag and |
| 280 // |drag_handler_->CancelDrag()| is async. Instead, set a flag to cancel | 280 // |drag_handler_->CancelDrag()| is async. Instead, set a flag to cancel |
| 281 // the drag and when the drag nested message loop ends, close the tab. | 281 // the drag and when the drag nested message loop ends, close the tab. |
| 282 drag_handler_->CancelDrag(); | 282 drag_handler_->CancelDrag(); |
| 283 close_tab_after_drag_ends_ = true; | 283 close_tab_after_drag_ends_ = true; |
| 284 } | 284 } |
| 285 | 285 |
| 286 void TabContentsViewWin::GetViewBounds(gfx::Rect* out) const { |
| 287 GetBounds(out, true); |
| 288 } |
| 289 |
| 286 void TabContentsViewWin::UpdateDragCursor(WebDragOperation operation) { | 290 void TabContentsViewWin::UpdateDragCursor(WebDragOperation operation) { |
| 287 drop_target_->set_drag_cursor(operation); | 291 drop_target_->set_drag_cursor(operation); |
| 288 } | 292 } |
| 289 | 293 |
| 290 void TabContentsViewWin::GotFocus() { | 294 void TabContentsViewWin::GotFocus() { |
| 291 if (tab_contents()->delegate()) | 295 if (tab_contents()->delegate()) |
| 292 tab_contents()->delegate()->TabContentsFocused(tab_contents()); | 296 tab_contents()->delegate()->TabContentsFocused(tab_contents()); |
| 293 } | 297 } |
| 294 | 298 |
| 295 void TabContentsViewWin::TakeFocus(bool reverse) { | 299 void TabContentsViewWin::TakeFocus(bool reverse) { |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 571 } | 575 } |
| 572 return false; | 576 return false; |
| 573 } | 577 } |
| 574 | 578 |
| 575 void TabContentsViewWin::WheelZoom(int distance) { | 579 void TabContentsViewWin::WheelZoom(int distance) { |
| 576 if (tab_contents()->delegate()) { | 580 if (tab_contents()->delegate()) { |
| 577 bool zoom_in = distance > 0; | 581 bool zoom_in = distance > 0; |
| 578 tab_contents()->delegate()->ContentsZoomChange(zoom_in); | 582 tab_contents()->delegate()->ContentsZoomChange(zoom_in); |
| 579 } | 583 } |
| 580 } | 584 } |
| OLD | NEW |