Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 211733003: Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 aura::client::kConstrainedWindowKey)) { 1361 aura::client::kConstrainedWindowKey)) {
1362 gfx::Rect bounds = window_->children()[i]->bounds(); 1362 gfx::Rect bounds = window_->children()[i]->bounds();
1363 bounds.set_origin( 1363 bounds.set_origin(
1364 gfx::Point((new_bounds.width() - bounds.width()) / 2, 1364 gfx::Point((new_bounds.width() - bounds.width()) / 2,
1365 (new_bounds.height() - bounds.height()) / 2)); 1365 (new_bounds.height() - bounds.height()) / 2));
1366 window_->children()[i]->SetBounds(bounds); 1366 window_->children()[i]->SetBounds(bounds);
1367 } 1367 }
1368 } 1368 }
1369 } 1369 }
1370 1370
1371 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) {
1372 return gfx::kNullCursor;
1373 }
1374
1375 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const { 1371 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const {
1376 return HTCLIENT; 1372 return HTCLIENT;
1377 } 1373 }
1378 1374
1379 bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling( 1375 bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling(
1380 aura::Window* child, 1376 aura::Window* child,
1381 const gfx::Point& location) { 1377 const gfx::Point& location) {
1382 return true; 1378 return true;
1383 } 1379 }
1384 1380
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 event.location(), 1521 event.location(),
1526 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), 1522 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
1527 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 1523 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
1528 if (drag_dest_delegate_) 1524 if (drag_dest_delegate_)
1529 drag_dest_delegate_->OnDrop(); 1525 drag_dest_delegate_->OnDrop();
1530 current_drop_data_.reset(); 1526 current_drop_data_.reset();
1531 return ConvertFromWeb(current_drag_op_); 1527 return ConvertFromWeb(current_drag_op_);
1532 } 1528 }
1533 1529
1534 } // namespace content 1530 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698