| 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/bookmarks/bookmark_model.h" | 8 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_utils.h" | 9 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 10 #include "chrome/browser/download/download_shelf.h" | 10 #include "chrome/browser/download/download_shelf.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 | 83 |
| 84 private: | 84 private: |
| 85 NSWindow* root_window_; | 85 NSWindow* root_window_; |
| 86 }; | 86 }; |
| 87 | 87 |
| 88 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { | 88 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { |
| 89 ASSERT_NO_FATAL_FAILURE(DoTest()); | 89 ASSERT_NO_FATAL_FAILURE(DoTest()); |
| 90 } | 90 } |
| 91 | 91 |
| 92 // Flaky on Mac: http://crbug.com/90557. | 92 // Flaky on Mac: http://crbug.com/90557. |
| 93 IN_PROC_BROWSER_TEST_F(ViewIDTest, FLAKY_Fullscreen) { | 93 IN_PROC_BROWSER_TEST_F(ViewIDTest, DISABLED_Fullscreen) { |
| 94 browser()->window()->EnterFullscreen( | 94 browser()->window()->EnterFullscreen( |
| 95 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION); | 95 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION); |
| 96 ASSERT_NO_FATAL_FAILURE(DoTest()); | 96 ASSERT_NO_FATAL_FAILURE(DoTest()); |
| 97 } | 97 } |
| 98 | 98 |
| 99 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { | 99 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { |
| 100 CheckViewID(VIEW_ID_TAB_0, true); | 100 CheckViewID(VIEW_ID_TAB_0, true); |
| 101 CheckViewID(VIEW_ID_TAB_LAST, true); | 101 CheckViewID(VIEW_ID_TAB_LAST, true); |
| 102 | 102 |
| 103 // Open 9 new tabs. | 103 // Open 9 new tabs. |
| 104 for (int i = 1; i <= 9; ++i) { | 104 for (int i = 1; i <= 9; ++i) { |
| 105 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false); | 105 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false); |
| 106 browser()->OpenURL(OpenURLParams( | 106 browser()->OpenURL(OpenURLParams( |
| 107 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, | 107 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, |
| 108 content::PAGE_TRANSITION_TYPED, false)); | 108 content::PAGE_TRANSITION_TYPED, false)); |
| 109 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); | 109 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); |
| 110 // VIEW_ID_TAB_LAST should always be available. | 110 // VIEW_ID_TAB_LAST should always be available. |
| 111 CheckViewID(VIEW_ID_TAB_LAST, true); | 111 CheckViewID(VIEW_ID_TAB_LAST, true); |
| 112 } | 112 } |
| 113 | 113 |
| 114 // Open the 11th tab. | 114 // Open the 11th tab. |
| 115 browser()->OpenURL(OpenURLParams( | 115 browser()->OpenURL(OpenURLParams( |
| 116 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, | 116 GURL(chrome::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, |
| 117 content::PAGE_TRANSITION_TYPED, false)); | 117 content::PAGE_TRANSITION_TYPED, false)); |
| 118 CheckViewID(VIEW_ID_TAB_LAST, true); | 118 CheckViewID(VIEW_ID_TAB_LAST, true); |
| 119 } | 119 } |
| OLD | NEW |