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

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

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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
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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 private: 105 private:
106 // Overridden from content::WebContentsScreenshotManager: 106 // Overridden from content::WebContentsScreenshotManager:
107 virtual void TakeScreenshotImpl( 107 virtual void TakeScreenshotImpl(
108 content::RenderViewHost* host, 108 content::RenderViewHost* host,
109 content::NavigationEntryImpl* entry) OVERRIDE { 109 content::NavigationEntryImpl* entry) OVERRIDE {
110 } 110 }
111 111
112 virtual void OnScreenshotSet(content::NavigationEntryImpl* entry) OVERRIDE { 112 virtual void OnScreenshotSet(content::NavigationEntryImpl* entry) OVERRIDE {
113 encoding_screenshot_in_progress_ = false; 113 encoding_screenshot_in_progress_ = false;
114 WebContentsScreenshotManager::OnScreenshotSet(entry); 114 WebContentsScreenshotManager::OnScreenshotSet(entry);
115 if (message_loop_runner_) 115 if (message_loop_runner_.get())
116 message_loop_runner_->Quit(); 116 message_loop_runner_->Quit();
117 } 117 }
118 118
119 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; 119 scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
120 bool encoding_screenshot_in_progress_; 120 bool encoding_screenshot_in_progress_;
121 121
122 DISALLOW_COPY_AND_ASSIGN(MockScreenshotManager); 122 DISALLOW_COPY_AND_ASSIGN(MockScreenshotManager);
123 }; 123 };
124 124
125 } // namespace 125 } // namespace
(...skipping 3546 matching lines...) Expand 10 before | Expand all | Expand 10 after
3672 PAGE_TRANSITION_LINK); 3672 PAGE_TRANSITION_LINK);
3673 session_helper_.AssertNavigationEquals(nav, 3673 session_helper_.AssertNavigationEquals(nav,
3674 windows_[0]->tabs[0]->navigations[0]); 3674 windows_[0]->tabs[0]->navigations[0]);
3675 nav.set_url(url2); 3675 nav.set_url(url2);
3676 session_helper_.AssertNavigationEquals(nav, 3676 session_helper_.AssertNavigationEquals(nav,
3677 windows_[0]->tabs[0]->navigations[1]); 3677 windows_[0]->tabs[0]->navigations[1]);
3678 } 3678 }
3679 */ 3679 */
3680 3680
3681 } // namespace content 3681 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/navigation_controller_impl.cc ('k') | content/browser/web_contents/navigation_entry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698