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

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 14081010: Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix some gtk issues Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index a87ebb0e7d0d5bddf5b587ba483d06c2606bfef4..788dac57a4f895c6723a170bce4ac3601496c65a 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -498,7 +498,7 @@ class ShadowWindow : public aura::Window,
}
void UpdateShadowBounds() {
- if (!shadow_.get())
+ if (!shadow_)
return;
gfx::Rect bound;
switch (edge_) {
@@ -896,7 +896,7 @@ WebContentsViewAura::~WebContentsViewAura() {
}
void WebContentsViewAura::SetupOverlayWindowForTesting() {
- if (navigation_overlay_.get())
+ if (navigation_overlay_)
navigation_overlay_->SetupForTesting();
}
@@ -927,7 +927,7 @@ void WebContentsViewAura::PrepareOverscrollWindow() {
// completed immidiately, which triggers |OnImplicitAnimationsCompleted()|
// callback, and that tries to reset |overscroll_window_| again, causing a
// double-free. So use a temporary variable here.
- if (overscroll_window_.get()) {
+ if (overscroll_window_) {
base::AutoReset<OverscrollMode> reset_state(&current_overscroll_gesture_,
current_overscroll_gesture_);
scoped_ptr<aura::Window> reset_window(overscroll_window_.release());
@@ -955,7 +955,7 @@ void WebContentsViewAura::PrepareOverscrollWindow() {
bounds.Offset(base::i18n::IsRTL() ? -bounds.width() : bounds.width(), 0);
}
- if (GetWindowToAnimateForOverscroll() == overscroll_window_.get()) {
+ if (GetWindowToAnimateForOverscroll() == overscroll_window_) {
overscroll_delegate->set_show_shadow(true);
window_->StackChildAbove(overscroll_window_.get(), content_container_);
} else {
@@ -1176,12 +1176,12 @@ void WebContentsViewAura::SetInitialFocus() {
}
void WebContentsViewAura::StoreFocus() {
- if (delegate_.get())
+ if (delegate_)
delegate_->StoreFocus();
}
void WebContentsViewAura::RestoreFocus() {
- if (delegate_.get())
+ if (delegate_)
delegate_->RestoreFocus();
}
@@ -1233,7 +1233,7 @@ void WebContentsViewAura::CreateView(
// delegate_->GetDragDestDelegate() creates a new delegate on every call.
// Hence, we save a reference to it locally. Similar model is used on other
// platforms as well.
- if (delegate_.get())
+ if (delegate_)
drag_dest_delegate_ = delegate_->GetDragDestDelegate();
}
@@ -1270,7 +1270,7 @@ RenderWidgetHostView* WebContentsViewAura::CreateViewForWidget(
if (host_impl->overscroll_controller() && web_contents_->GetDelegate() &&
web_contents_->GetDelegate()->CanOverscrollContent()) {
host_impl->overscroll_controller()->set_delegate(this);
- if (!navigation_overlay_.get())
+ if (!navigation_overlay_)
navigation_overlay_.reset(new OverscrollNavigationOverlay());
}
@@ -1312,7 +1312,7 @@ void WebContentsViewAura::SetOverscrollControllerEnabled(bool enabled) {
void WebContentsViewAura::ShowContextMenu(
const ContextMenuParams& params,
ContextMenuSourceType type) {
- if (delegate_.get())
+ if (delegate_)
delegate_->ShowContextMenu(params, type);
}
@@ -1493,7 +1493,7 @@ gfx::Size WebContentsViewAura::GetMaximumSize() const {
void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) {
SizeChangedCommon(new_bounds.size());
- if (delegate_.get())
+ if (delegate_)
delegate_->SizeChanged(new_bounds.size());
// Constrained web dialogs, need to be kept centered over our content area.
« no previous file with comments | « content/browser/web_contents/web_contents_view_android.cc ('k') | content/browser/web_contents/web_contents_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698