| OLD | NEW |
| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 #include "base/mac/mac_util.h" | 86 #include "base/mac/mac_util.h" |
| 87 #include "base/mac/scoped_nsautorelease_pool.h" | 87 #include "base/mac/scoped_nsautorelease_pool.h" |
| 88 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 88 #include "chrome/browser/ui/cocoa/run_loop_testing.h" |
| 89 #endif | 89 #endif |
| 90 | 90 |
| 91 #if defined(OS_WIN) | 91 #if defined(OS_WIN) |
| 92 #include "base/i18n/rtl.h" | 92 #include "base/i18n/rtl.h" |
| 93 #include "chrome/browser/browser_process.h" | 93 #include "chrome/browser/browser_process.h" |
| 94 #endif | 94 #endif |
| 95 | 95 |
| 96 using base::ASCIIToUTF16; |
| 96 using content::InterstitialPage; | 97 using content::InterstitialPage; |
| 97 using content::HostZoomMap; | 98 using content::HostZoomMap; |
| 98 using content::NavigationController; | 99 using content::NavigationController; |
| 99 using content::NavigationEntry; | 100 using content::NavigationEntry; |
| 100 using content::OpenURLParams; | 101 using content::OpenURLParams; |
| 101 using content::Referrer; | 102 using content::Referrer; |
| 102 using content::WebContents; | 103 using content::WebContents; |
| 103 using content::WebContentsObserver; | 104 using content::WebContentsObserver; |
| 104 using extensions::Extension; | 105 using extensions::Extension; |
| 105 | 106 |
| (...skipping 2449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2555 exp_commit_size.Enlarge(wcv_resize_insets.width(), | 2556 exp_commit_size.Enlarge(wcv_resize_insets.width(), |
| 2556 wcv_resize_insets.height() + height_inset); | 2557 wcv_resize_insets.height() + height_inset); |
| 2557 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); | 2558 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
| 2558 EXPECT_EQ(exp_commit_size, wcv_commit_size2); | 2559 EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
| 2559 // Sizes of RenderWidgetHostView and WebContentsView before and after | 2560 // Sizes of RenderWidgetHostView and WebContentsView before and after |
| 2560 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. | 2561 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. |
| 2561 EXPECT_EQ(rwhv_commit_size2, | 2562 EXPECT_EQ(rwhv_commit_size2, |
| 2562 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); | 2563 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); |
| 2563 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); | 2564 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); |
| 2564 } | 2565 } |
| OLD | NEW |