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

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 84063003: Rename WebContentsObserver::NavigateToPendingEntry to DidStartNavigationToPendingEntry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding better comment from Charlie. Created 7 years, 1 month 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 271
272 // Cache the size when RenderViewHost is first created. 272 // Cache the size when RenderViewHost is first created.
273 virtual void RenderViewCreated( 273 virtual void RenderViewCreated(
274 content::RenderViewHost* render_view_host) OVERRIDE { 274 content::RenderViewHost* render_view_host) OVERRIDE {
275 render_view_sizes_[render_view_host].rwhv_create_size = 275 render_view_sizes_[render_view_host].rwhv_create_size =
276 render_view_host->GetView()->GetViewBounds().size(); 276 render_view_host->GetView()->GetViewBounds().size();
277 } 277 }
278 278
279 // Enlarge WebContentsView by |wcv_resize_insets_| while the navigation entry 279 // Enlarge WebContentsView by |wcv_resize_insets_| while the navigation entry
280 // is pending. 280 // is pending.
281 virtual void NavigateToPendingEntry( 281 virtual void DidStartNavigationToPendingEntry(
282 const GURL& url, 282 const GURL& url,
283 NavigationController::ReloadType reload_type) OVERRIDE { 283 NavigationController::ReloadType reload_type) OVERRIDE {
284 if (wcv_resize_insets_.IsEmpty()) 284 if (wcv_resize_insets_.IsEmpty())
285 return; 285 return;
286 // Resizing the main browser window by |wcv_resize_insets_| will 286 // Resizing the main browser window by |wcv_resize_insets_| will
287 // automatically resize the WebContentsView by the same amount. 287 // automatically resize the WebContentsView by the same amount.
288 // Just resizing WebContentsView directly doesn't work on Linux, because the 288 // Just resizing WebContentsView directly doesn't work on Linux, because the
289 // next automatic layout of the browser window will resize WebContentsView 289 // next automatic layout of the browser window will resize WebContentsView
290 // back to the previous size. To make it consistent, resize main browser 290 // back to the previous size. To make it consistent, resize main browser
291 // window on all platforms. 291 // window on all platforms.
(...skipping 20 matching lines...) Expand all
312 312
313 private: 313 private:
314 struct Sizes { 314 struct Sizes {
315 gfx::Size rwhv_create_size; // Size of RenderWidgetHostView when created. 315 gfx::Size rwhv_create_size; // Size of RenderWidgetHostView when created.
316 gfx::Size rwhv_commit_size; // Size of RenderWidgetHostView when committed. 316 gfx::Size rwhv_commit_size; // Size of RenderWidgetHostView when committed.
317 gfx::Size wcv_commit_size; // Size of WebContentsView when committed. 317 gfx::Size wcv_commit_size; // Size of WebContentsView when committed.
318 }; 318 };
319 319
320 typedef std::map<content::RenderViewHost*, Sizes> RenderViewSizes; 320 typedef std::map<content::RenderViewHost*, Sizes> RenderViewSizes;
321 RenderViewSizes render_view_sizes_; 321 RenderViewSizes render_view_sizes_;
322 // Enlarge WebContentsView by this size insets in NavigateToPendingEntry. 322 // Enlarge WebContentsView by this size insets in
323 // DidStartNavigationToPendingEntry.
323 gfx::Size wcv_resize_insets_; 324 gfx::Size wcv_resize_insets_;
324 BrowserWindow* browser_window_; // Weak ptr. 325 BrowserWindow* browser_window_; // Weak ptr.
325 326
326 DISALLOW_COPY_AND_ASSIGN(RenderViewSizeObserver); 327 DISALLOW_COPY_AND_ASSIGN(RenderViewSizeObserver);
327 }; 328 };
328 329
329 } // namespace 330 } // namespace
330 331
331 class BrowserTest : public ExtensionBrowserTest { 332 class BrowserTest : public ExtensionBrowserTest {
332 protected: 333 protected:
(...skipping 2204 matching lines...) Expand 10 before | Expand all | Expand 10 after
2537 gfx::Size rwhv_create_size2, rwhv_commit_size2, wcv_commit_size2; 2538 gfx::Size rwhv_create_size2, rwhv_commit_size2, wcv_commit_size2;
2538 observer.GetSizeForRenderViewHost(web_contents->GetRenderViewHost(), 2539 observer.GetSizeForRenderViewHost(web_contents->GetRenderViewHost(),
2539 &rwhv_create_size2, 2540 &rwhv_create_size2,
2540 &rwhv_commit_size2, 2541 &rwhv_commit_size2,
2541 &wcv_commit_size2); 2542 &wcv_commit_size2);
2542 // The create height of RenderWidgetHostView should include the height inset. 2543 // The create height of RenderWidgetHostView should include the height inset.
2543 EXPECT_EQ(gfx::Size(initial_wcv_size.width(), 2544 EXPECT_EQ(gfx::Size(initial_wcv_size.width(),
2544 initial_wcv_size.height() + height_inset), 2545 initial_wcv_size.height() + height_inset),
2545 rwhv_create_size2); 2546 rwhv_create_size2);
2546 // WebContentsView was resized in 2547 // WebContentsView was resized in
2547 // RenderViewSizeObserver::NavigateToPendingEntry after RenderWidgetHostView 2548 // RenderViewSizeObserver::DidStartNavigationToPendingEntry after
2548 // was created, so the commit size should be resized accordingly. 2549 // RenderWidgetHostView was created, so the commit size should be resized
2550 // accordingly.
2549 gfx::Size exp_commit_size(initial_wcv_size); 2551 gfx::Size exp_commit_size(initial_wcv_size);
2550 exp_commit_size.Enlarge(wcv_resize_insets.width(), 2552 exp_commit_size.Enlarge(wcv_resize_insets.width(),
2551 wcv_resize_insets.height() + height_inset); 2553 wcv_resize_insets.height() + height_inset);
2552 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2554 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2553 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2555 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2554 // Sizes of RenderWidgetHostView and WebContentsView before and after 2556 // Sizes of RenderWidgetHostView and WebContentsView before and after
2555 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. 2557 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same.
2556 EXPECT_EQ(rwhv_commit_size2, 2558 EXPECT_EQ(rwhv_commit_size2,
2557 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2559 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2558 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); 2560 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize());
2559 } 2561 }
OLDNEW
« no previous file with comments | « chrome/browser/net/predictor_tab_helper.cc ('k') | chrome/browser/ui/browser_instant_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698