summaryrefslogtreecommitdiffstats
path: root/ui/aura/root_window.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 22:33:14 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 22:33:14 +0000
commit363e754da58afc330b050cfb6da2a06e418bff97 (patch)
treea84b3d5d0f1c1f720bdea58b68b993dfcbcc27d0 /ui/aura/root_window.cc
parent2730fba2b14d50974196793858c7008eedcb194b (diff)
downloadchromium_src-363e754da58afc330b050cfb6da2a06e418bff97.zip
chromium_src-363e754da58afc330b050cfb6da2a06e418bff97.tar.gz
chromium_src-363e754da58afc330b050cfb6da2a06e418bff97.tar.bz2
ui/aura: Remove unnecessary scoped_ptr ".get()" calls.
Implicit testing to scoped_ptr<> was added by Addrienne (enne@) in r174057. This patch was generated by Elliot's script: $ cd ui/aura $ git ls-files | xargs sed -i -e "s/if (\(.*\)\.get())/if (\1)/g;" BUG=232084 TEST=aura_unittests TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/13845025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window.cc')
-rw-r--r--ui/aura/root_window.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 968a25c..e3fccfb 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -467,7 +467,7 @@ void RootWindow::HoldMouseMoves() {
void RootWindow::ReleaseMouseMoves() {
--mouse_move_hold_count_;
DCHECK_GE(mouse_move_hold_count_, 0);
- if (!mouse_move_hold_count_ && held_mouse_move_.get()) {
+ if (!mouse_move_hold_count_ && held_mouse_move_) {
// We don't want to call DispatchHeldEvents directly, because this might
// be called from a deep stack while another event, in which case
// dispatching another one may not be safe/expected.
@@ -1106,7 +1106,7 @@ bool RootWindow::DispatchMouseEventToTarget(ui::MouseEvent* event,
}
void RootWindow::DispatchHeldEvents() {
- if (held_repostable_event_.get()) {
+ if (held_repostable_event_) {
if (held_repostable_event_->type() == ui::ET_MOUSE_PRESSED) {
ui::MouseEvent mouse_event(
static_cast<const ui::MouseEvent&>(*held_repostable_event_.get()));
@@ -1118,7 +1118,7 @@ void RootWindow::DispatchHeldEvents() {
}
held_repostable_event_.reset();
}
- if (held_mouse_move_.get()) {
+ if (held_mouse_move_) {
// If a mouse move has been synthesized, the target location is suspect,
// so drop the held event.
if (!synthesize_mouse_move_)