diff options
| author | avi <avi@chromium.org> | 2015-07-27 11:25:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-27 18:26:17 +0000 |
| commit | 67081d0ae8833a0f36203f2437b0abdcc4c5e197 (patch) | |
| tree | 1a7d69033f39e199116618eb2a2bf7ad82b3db31 /content/browser/frame_host/navigation_controller_impl.cc | |
| parent | 324ef06639ffc5e5c6f43e079a03341a37b75b88 (diff) | |
| download | chromium_src-67081d0ae8833a0f36203f2437b0abdcc4c5e197.zip chromium_src-67081d0ae8833a0f36203f2437b0abdcc4c5e197.tar.gz chromium_src-67081d0ae8833a0f36203f2437b0abdcc4c5e197.tar.bz2 | |
Clean up around NavigationEntryScreenshotManager a bit.
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/1254993003
Cr-Commit-Position: refs/heads/master@{#340508}
Diffstat (limited to 'content/browser/frame_host/navigation_controller_impl.cc')
| -rw-r--r-- | content/browser/frame_host/navigation_controller_impl.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc index df3413c..59a07a2 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -529,9 +529,11 @@ void NavigationControllerImpl::TakeScreenshot() { } void NavigationControllerImpl::SetScreenshotManager( - NavigationEntryScreenshotManager* manager) { - screenshot_manager_.reset(manager ? manager : - new NavigationEntryScreenshotManager(this)); + scoped_ptr<NavigationEntryScreenshotManager> manager) { + if (manager.get()) + screenshot_manager_ = manager.Pass(); + else + screenshot_manager_.reset(new NavigationEntryScreenshotManager(this)); } bool NavigationControllerImpl::CanGoBack() const { |