| 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 #include "content/browser/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 aura::Window* window = GetContentNativeView(); | 557 aura::Window* window = GetContentNativeView(); |
| 558 gfx::Point screen_loc = display::Screen::GetScreen()->GetCursorScreenPoint(); | 558 gfx::Point screen_loc = display::Screen::GetScreen()->GetCursorScreenPoint(); |
| 559 gfx::Point client_loc = screen_loc; | 559 gfx::Point client_loc = screen_loc; |
| 560 aura::client::ScreenPositionClient* screen_position_client = | 560 aura::client::ScreenPositionClient* screen_position_client = |
| 561 aura::client::GetScreenPositionClient(window->GetRootWindow()); | 561 aura::client::GetScreenPositionClient(window->GetRootWindow()); |
| 562 if (screen_position_client) | 562 if (screen_position_client) |
| 563 screen_position_client->ConvertPointFromScreen(window, &client_loc); | 563 screen_position_client->ConvertPointFromScreen(window, &client_loc); |
| 564 | 564 |
| 565 // TODO(paulmeyer): In the OOPIF case, should |client_loc| be converted to | 565 // TODO(paulmeyer): In the OOPIF case, should |client_loc| be converted to |
| 566 // the coordinates local to |drag_start_rwh_|? See crbug.com/647249. | 566 // the coordinates local to |drag_start_rwh_|? See crbug.com/647249. |
| 567 web_contents_->DragSourceEndedAt(client_loc.x(), client_loc.x(), | 567 web_contents_->DragSourceEndedAt(client_loc.x(), client_loc.y(), |
| 568 screen_loc.x(), screen_loc.y(), ops, | 568 screen_loc.x(), screen_loc.y(), ops, |
| 569 drag_start_rwh_.get()); | 569 drag_start_rwh_.get()); |
| 570 } | 570 } |
| 571 | 571 |
| 572 void WebContentsViewAura::InstallOverscrollControllerDelegate( | 572 void WebContentsViewAura::InstallOverscrollControllerDelegate( |
| 573 RenderWidgetHostViewAura* view) { | 573 RenderWidgetHostViewAura* view) { |
| 574 const std::string value = base::CommandLine::ForCurrentProcess()-> | 574 const std::string value = base::CommandLine::ForCurrentProcess()-> |
| 575 GetSwitchValueASCII(switches::kOverscrollHistoryNavigation); | 575 GetSwitchValueASCII(switches::kOverscrollHistoryNavigation); |
| 576 if (value == "0") { | 576 if (value == "0") { |
| 577 navigation_overlay_.reset(); | 577 navigation_overlay_.reset(); |
| (...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1247 bool allow_multiple_selection) { | 1247 bool allow_multiple_selection) { |
| 1248 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; | 1248 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; |
| 1249 } | 1249 } |
| 1250 | 1250 |
| 1251 void WebContentsViewAura::HidePopupMenu() { | 1251 void WebContentsViewAura::HidePopupMenu() { |
| 1252 NOTIMPLEMENTED(); | 1252 NOTIMPLEMENTED(); |
| 1253 } | 1253 } |
| 1254 #endif | 1254 #endif |
| 1255 | 1255 |
| 1256 } // namespace content | 1256 } // namespace content |
| OLD | NEW |