diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 05:53:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 05:53:20 +0000 |
| commit | 4ca153033f022dc6e11d6094daed41b1ed0a995f (patch) | |
| tree | f4720517b10953166f84707ca3ec8b82de860884 /chrome/browser/gpu_pixel_browsertest.cc | |
| parent | 08bd3d71d969061b1588e6a4210f6d74b0ec0c6d (diff) | |
| download | chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.zip chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.gz chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.bz2 | |
Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've converted the easy ones, I'll do the ones with more dependencies in a separate change to keep things trivial to review.
I considered taking out GetSelectedTabContents altogether and having people just use GetSelectedTabContentsWrapper()->web_contents() per the existing comment in browser.h, but there are a lot of callers and it seemed too long to type.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9015022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_pixel_browsertest.cc')
| -rw-r--r-- | chrome/browser/gpu_pixel_browsertest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gpu_pixel_browsertest.cc b/chrome/browser/gpu_pixel_browsertest.cc index 228d137..6b39fd0 100644 --- a/chrome/browser/gpu_pixel_browsertest.cc +++ b/chrome/browser/gpu_pixel_browsertest.cc @@ -17,7 +17,7 @@ #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -70,7 +70,7 @@ bool WritePNGFile(const SkBitmap& bitmap, const FilePath& file_path) { // Resizes the browser window so that the tab's contents are at a given size. void ResizeTabContainer(Browser* browser, const gfx::Size& desired_size) { gfx::Rect container_rect; - browser->GetSelectedTabContents()->GetContainerBounds(&container_rect); + browser->GetSelectedWebContents()->GetContainerBounds(&container_rect); // Size cannot be negative, so use a point. gfx::Point correction(desired_size.width() - container_rect.size().width(), desired_size.height() - container_rect.size().height()); @@ -325,7 +325,7 @@ IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, MAYBE_WebGLTeapot) { gfx::Rect root_bounds = browser()->window()->GetBounds(); gfx::Rect tab_contents_bounds; - browser()->GetSelectedTabContents()->GetContainerBounds(&tab_contents_bounds); + browser()->GetSelectedWebContents()->GetContainerBounds(&tab_contents_bounds); gfx::Rect snapshot_bounds(tab_contents_bounds.x() - root_bounds.x(), tab_contents_bounds.y() - root_bounds.y(), |