| 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 "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 2341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2352 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); | 2352 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
| 2353 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("WebKit"), true, true, | 2353 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("WebKit"), true, true, |
| 2354 NULL, NULL), | 2354 NULL, NULL), |
| 2355 0); | 2355 0); |
| 2356 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("OS"), true, true, | 2356 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("OS"), true, true, |
| 2357 NULL, NULL), | 2357 NULL, NULL), |
| 2358 0); | 2358 0); |
| 2359 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("JavaScript"), true, | 2359 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("JavaScript"), true, |
| 2360 true, NULL, NULL), | 2360 true, NULL, NULL), |
| 2361 0); | 2361 0); |
| 2362 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("Flash"), true, |
| 2363 true, NULL, NULL), |
| 2364 0); |
| 2362 } | 2365 } |
| 2363 | 2366 |
| 2364 static const base::FilePath::CharType* kTestDir = | 2367 static const base::FilePath::CharType* kTestDir = |
| 2365 FILE_PATH_LITERAL("click_modifier"); | 2368 FILE_PATH_LITERAL("click_modifier"); |
| 2366 static const char kFirstPageTitle[] = "First window"; | 2369 static const char kFirstPageTitle[] = "First window"; |
| 2367 static const char kSecondPageTitle[] = "New window!"; | 2370 static const char kSecondPageTitle[] = "New window!"; |
| 2368 | 2371 |
| 2369 class ClickModifierTest : public InProcessBrowserTest { | 2372 class ClickModifierTest : public InProcessBrowserTest { |
| 2370 public: | 2373 public: |
| 2371 ClickModifierTest() { | 2374 ClickModifierTest() { |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2881 Browser* browser = new Browser(params); | 2884 Browser* browser = new Browser(params); |
| 2882 gfx::Rect bounds = browser->window()->GetBounds(); | 2885 gfx::Rect bounds = browser->window()->GetBounds(); |
| 2883 | 2886 |
| 2884 // Should be EXPECT_EQ, but this width is inconsistent across platforms. | 2887 // Should be EXPECT_EQ, but this width is inconsistent across platforms. |
| 2885 // See https://crbug.com/567925. | 2888 // See https://crbug.com/567925. |
| 2886 EXPECT_GE(bounds.width(), 100); | 2889 EXPECT_GE(bounds.width(), 100); |
| 2887 EXPECT_EQ(122, bounds.height()); | 2890 EXPECT_EQ(122, bounds.height()); |
| 2888 browser->window()->Close(); | 2891 browser->window()->Close(); |
| 2889 } | 2892 } |
| 2890 } | 2893 } |
| OLD | NEW |