OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 #include "base/mac/mac_util.h" | 95 #include "base/mac/mac_util.h" |
96 #include "base/mac/scoped_nsautorelease_pool.h" | 96 #include "base/mac/scoped_nsautorelease_pool.h" |
97 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 97 #include "chrome/browser/ui/cocoa/run_loop_testing.h" |
98 #endif | 98 #endif |
99 | 99 |
100 #if defined(OS_WIN) | 100 #if defined(OS_WIN) |
101 #include "base/i18n/rtl.h" | 101 #include "base/i18n/rtl.h" |
102 #include "chrome/browser/browser_process.h" | 102 #include "chrome/browser/browser_process.h" |
103 #endif | 103 #endif |
104 | 104 |
| 105 using app_modal::AppModalDialog; |
| 106 using app_modal::AppModalDialogQueue; |
| 107 using app_modal::JavaScriptAppModalDialog; |
105 using base::ASCIIToUTF16; | 108 using base::ASCIIToUTF16; |
106 using content::InterstitialPage; | 109 using content::InterstitialPage; |
107 using content::HostZoomMap; | 110 using content::HostZoomMap; |
108 using content::NavigationController; | 111 using content::NavigationController; |
109 using content::NavigationEntry; | 112 using content::NavigationEntry; |
110 using content::OpenURLParams; | 113 using content::OpenURLParams; |
111 using content::Referrer; | 114 using content::Referrer; |
112 using content::WebContents; | 115 using content::WebContents; |
113 using content::WebContentsObserver; | 116 using content::WebContentsObserver; |
114 using extensions::Extension; | 117 using extensions::Extension; |
(...skipping 2536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2651 #endif | 2654 #endif |
2652 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); | 2655 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
2653 EXPECT_EQ(exp_commit_size, wcv_commit_size2); | 2656 EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
2654 gfx::Size exp_final_size(initial_wcv_size); | 2657 gfx::Size exp_final_size(initial_wcv_size); |
2655 exp_final_size.Enlarge(wcv_resize_insets.width(), | 2658 exp_final_size.Enlarge(wcv_resize_insets.width(), |
2656 wcv_resize_insets.height() + height_inset); | 2659 wcv_resize_insets.height() + height_inset); |
2657 EXPECT_EQ(exp_final_size, | 2660 EXPECT_EQ(exp_final_size, |
2658 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); | 2661 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); |
2659 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); | 2662 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); |
2660 } | 2663 } |
OLD | NEW |