summaryrefslogtreecommitdiffstats
path: root/content/browser/web_contents
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/web_contents')
-rw-r--r--content/browser/web_contents/render_view_host_manager.cc4
-rw-r--r--content/browser/web_contents/web_contents_impl.cc6
-rw-r--r--content/browser/web_contents/web_contents_view_android.cc2
-rw-r--r--content/browser/web_contents/web_contents_view_aura.cc20
-rw-r--r--content/browser/web_contents/web_contents_view_gtk.cc12
-rw-r--r--content/browser/web_contents/web_contents_view_mac.mm2
-rw-r--r--content/browser/web_contents/web_contents_view_win.cc14
-rw-r--r--content/browser/web_contents/web_drag_source_gtk.cc4
-rw-r--r--content/browser/web_contents/web_drag_source_mac.mm8
9 files changed, 36 insertions, 36 deletions
diff --git a/content/browser/web_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc
index 3f14460..558a7dd 100644
--- a/content/browser/web_contents/render_view_host_manager.cc
+++ b/content/browser/web_contents/render_view_host_manager.cc
@@ -703,9 +703,9 @@ void RenderViewHostManager::CommitPending() {
// |pending_web_ui_|, or clear |web_ui_| if there is no pending WebUI, or
// leave |web_ui_| as is if reusing it.
DCHECK(!(pending_web_ui_.get() && pending_and_current_web_ui_.get()));
- if (pending_web_ui_.get())
+ if (pending_web_ui_)
web_ui_.reset(pending_web_ui_.release());
- else if (!pending_and_current_web_ui_.get())
+ else if (!pending_and_current_web_ui_)
web_ui_.reset();
// It's possible for the pending_render_view_host_ to be NULL when we aren't
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b3dc3fa..1cc9efeb 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1110,13 +1110,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(GetContentClient()->browser()->
OverrideCreateWebContentsView(this, &render_view_host_delegate_view_));
- if (view_.get()) {
+ if (view_) {
CHECK(render_view_host_delegate_view_);
} else {
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
- if (browser_plugin_guest_.get()) {
+ if (browser_plugin_guest_) {
WebContentsViewPort* platform_view = CreateWebContentsView(
this, delegate, &render_view_host_delegate_view_);
@@ -2577,7 +2577,7 @@ gfx::Rect WebContentsImpl::GetRootWindowResizerRect() const {
}
void WebContentsImpl::RemoveBrowserPluginEmbedder() {
- if (browser_plugin_embedder_.get())
+ if (browser_plugin_embedder_)
browser_plugin_embedder_.reset();
}
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index 28ce304..9108005 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -177,7 +177,7 @@ void WebContentsViewAndroid::SetOverscrollControllerEnabled(bool enabled) {
void WebContentsViewAndroid::ShowContextMenu(
const ContextMenuParams& params,
ContextMenuSourceType type) {
- if (delegate_.get())
+ if (delegate_)
delegate_->ShowContextMenu(params, type);
}
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index a87ebb0..788dac5 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.
diff --git a/content/browser/web_contents/web_contents_view_gtk.cc b/content/browser/web_contents/web_contents_view_gtk.cc
index b70b0df..9cb92127 100644
--- a/content/browser/web_contents/web_contents_view_gtk.cc
+++ b/content/browser/web_contents/web_contents_view_gtk.cc
@@ -100,7 +100,7 @@ WebContentsViewGtk::WebContentsViewGtk(
gtk_widget_show(expanded_.get());
drag_source_.reset(new WebDragSourceGtk(web_contents));
- if (delegate_.get())
+ if (delegate_)
delegate_->Initialize(expanded_.get(), &focus_store_);
}
@@ -109,7 +109,7 @@ WebContentsViewGtk::~WebContentsViewGtk() {
}
gfx::NativeView WebContentsViewGtk::GetNativeView() const {
- if (delegate_.get())
+ if (delegate_)
return delegate_->GetNativeView();
return expanded_.get();
@@ -151,7 +151,7 @@ void WebContentsViewGtk::OnTabCrashed(base::TerminationStatus status,
void WebContentsViewGtk::Focus() {
if (web_contents_->ShowingInterstitialPage()) {
web_contents_->GetInterstitialPage()->Focus();
- } else if (delegate_.get()) {
+ } else if (delegate_) {
delegate_->Focus();
}
}
@@ -314,7 +314,7 @@ void WebContentsViewGtk::UpdateDragDest(RenderViewHost* host) {
// Create the new drag_dest_.
drag_dest_.reset(new WebDragDestGtk(web_contents_, content_view));
- if (delegate_.get())
+ if (delegate_)
drag_dest_->set_delegate(delegate_->GetDragDestDelegate());
}
@@ -326,7 +326,7 @@ void WebContentsViewGtk::UpdateDragDest(RenderViewHost* host) {
gboolean WebContentsViewGtk::OnFocus(GtkWidget* widget,
GtkDirectionType focus) {
// Give our view wrapper first chance at this event.
- if (delegate_.get()) {
+ if (delegate_) {
gboolean return_value = FALSE;
if (delegate_->OnNativeViewFocusEvent(widget, focus, &return_value))
return return_value;
@@ -347,7 +347,7 @@ gboolean WebContentsViewGtk::OnFocus(GtkWidget* widget,
void WebContentsViewGtk::ShowContextMenu(
const ContextMenuParams& params,
ContextMenuSourceType type) {
- if (delegate_.get())
+ if (delegate_)
delegate_->ShowContextMenu(params, type);
else
DLOG(ERROR) << "Cannot show context menus without a delegate.";
diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm
index c22a840..f8cb4ae 100644
--- a/content/browser/web_contents/web_contents_view_mac.mm
+++ b/content/browser/web_contents/web_contents_view_mac.mm
@@ -483,7 +483,7 @@ void WebContentsViewMac::CloseTab() {
// Returns what kind of drag operations are available. This is a required
// method for NSDraggingSource.
- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal {
- if (dragSource_.get())
+ if (dragSource_)
return [dragSource_ draggingSourceOperationMaskForLocal:isLocal];
// No web drag source - this is the case for dragging a file from the
// downloads manager. Default to copy operation. Note: It is desirable to
diff --git a/content/browser/web_contents/web_contents_view_win.cc b/content/browser/web_contents/web_contents_view_win.cc
index 28f489a..3ceeb0f 100644
--- a/content/browser/web_contents/web_contents_view_win.cc
+++ b/content/browser/web_contents/web_contents_view_win.cc
@@ -155,7 +155,7 @@ void WebContentsViewWin::CreateView(
// Remove the root view drop target so we can register our own.
RevokeDragDrop(GetNativeView());
drag_dest_ = new WebDragDest(hwnd(), web_contents_);
- if (delegate_.get()) {
+ if (delegate_) {
WebDragDestDelegate* delegate = delegate_->GetDragDestDelegate();
if (delegate)
drag_dest_->set_delegate(delegate);
@@ -184,12 +184,12 @@ void WebContentsViewWin::SetInitialFocus() {
}
void WebContentsViewWin::StoreFocus() {
- if (delegate_.get())
+ if (delegate_)
delegate_->StoreFocus();
}
void WebContentsViewWin::RestoreFocus() {
- if (delegate_.get())
+ if (delegate_)
delegate_->RestoreFocus();
}
@@ -246,7 +246,7 @@ void WebContentsViewWin::SetOverscrollControllerEnabled(bool enabled) {
void WebContentsViewWin::ShowContextMenu(
const ContextMenuParams& params,
ContextMenuSourceType type) {
- if (delegate_.get())
+ if (delegate_)
delegate_->ShowContextMenu(params, type);
}
@@ -310,11 +310,11 @@ LRESULT WebContentsViewWin::OnCreate(
LRESULT WebContentsViewWin::OnDestroy(
UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled) {
- if (drag_dest_.get()) {
+ if (drag_dest_) {
RevokeDragDrop(GetNativeView());
drag_dest_ = NULL;
}
- if (drag_handler_.get()) {
+ if (drag_handler_) {
drag_handler_->CancelDrag();
drag_handler_ = NULL;
}
@@ -357,7 +357,7 @@ LRESULT WebContentsViewWin::OnWindowPosChanged(
if (rwhv)
rwhv->SetSize(size);
- if (delegate_.get())
+ if (delegate_)
delegate_->SizeChanged(size);
return 0;
diff --git a/content/browser/web_contents/web_drag_source_gtk.cc b/content/browser/web_contents/web_drag_source_gtk.cc
index 9fe1c16..64e883b 100644
--- a/content/browser/web_contents/web_drag_source_gtk.cc
+++ b/content/browser/web_contents/web_drag_source_gtk.cc
@@ -58,7 +58,7 @@ WebDragSourceGtk::WebDragSourceGtk(WebContents* web_contents)
WebDragSourceGtk::~WebDragSourceGtk() {
// Break the current drag, if any.
- if (drop_data_.get()) {
+ if (drop_data_) {
gtk_grab_add(drag_widget_);
gtk_grab_remove(drag_widget_);
MessageLoopForUI::current()->RemoveObserver(this);
@@ -245,7 +245,7 @@ void WebDragSourceGtk::OnDragDataGet(GtkWidget* sender,
CreateFileStreamForDrop(
&file_path,
GetContentClient()->browser()->GetNetLog()));
- if (file_stream.get()) {
+ if (file_stream) {
// Start downloading the file to the stream.
scoped_refptr<DragDownloadFile> drag_file_downloader =
new DragDownloadFile(
diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm
index 5e3a4ea..621c813 100644
--- a/content/browser/web_contents/web_drag_source_mac.mm
+++ b/content/browser/web_contents/web_drag_source_mac.mm
@@ -150,7 +150,7 @@ void PromiseWriterHelper(const WebDropData& drop_data,
"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">");
// Be extra paranoid; avoid crashing.
- if (!dropData_.get()) {
+ if (!dropData_) {
NOTREACHED();
return;
}
@@ -187,7 +187,7 @@ void PromiseWriterHelper(const WebDropData& drop_data,
forType:kNSURLTitlePboardType];
// File contents.
- } else if ([type isEqualToString:base::mac::CFToNSCast(fileUTI_.get())]) {
+ } else if ([type isEqualToString:base::mac::CFToNSCast(fileUTI_)]) {
[pboard setData:[NSData dataWithBytes:dropData_->file_contents.data()
length:dropData_->file_contents.length()]
forType:base::mac::CFToNSCast(fileUTI_.get())];
@@ -315,7 +315,7 @@ void PromiseWriterHelper(const WebDropData& drop_data,
- (NSString*)dragPromisedFileTo:(NSString*)path {
// Be extra paranoid; avoid crashing.
- if (!dropData_.get()) {
+ if (!dropData_) {
NOTREACHED() << "No drag-and-drop data available for promised file.";
return nil;
}
@@ -331,7 +331,7 @@ void PromiseWriterHelper(const WebDropData& drop_data,
base::ThreadRestrictions::ScopedAllowIO allowIO;
scoped_ptr<FileStream> fileStream(content::CreateFileStreamForDrop(
&filePath, content::GetContentClient()->browser()->GetNetLog()));
- if (!fileStream.get())
+ if (!fileStream)
return nil;
if (downloadURL_.is_valid()) {
generated by cgit v1.1 at 2025-02-14 03:09:44 +0000