| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/gfx/rect.h" | 9 #include "base/gfx/rect.h" |
| 10 #include "base/keyboard_codes.h" | 10 #include "base/keyboard_codes.h" |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 ASSERT_EQ(active_tab, 1); | 276 ASSERT_EQ(active_tab, 1); |
| 277 | 277 |
| 278 scoped_refptr<WindowProxy> window(browser->GetWindow()); | 278 scoped_refptr<WindowProxy> window(browser->GetWindow()); |
| 279 ASSERT_TRUE(window->SimulateOSKeyPress( | 279 ASSERT_TRUE(window->SimulateOSKeyPress( |
| 280 base::VKEY_TAB, views::Event::EF_CONTROL_DOWN)); | 280 base::VKEY_TAB, views::Event::EF_CONTROL_DOWN)); |
| 281 ASSERT_TRUE(browser->WaitForTabToBecomeActive(0, action_max_timeout_ms())); | 281 ASSERT_TRUE(browser->WaitForTabToBecomeActive(0, action_max_timeout_ms())); |
| 282 | 282 |
| 283 #if !defined(OS_MACOSX) // see BrowserWindowCocoa::GetCommandId | 283 #if !defined(OS_MACOSX) // see BrowserWindowCocoa::GetCommandId |
| 284 ASSERT_TRUE(browser->ActivateTab(1)); | 284 ASSERT_TRUE(browser->ActivateTab(1)); |
| 285 ASSERT_TRUE(window->SimulateOSKeyPress( | 285 ASSERT_TRUE(window->SimulateOSKeyPress( |
| 286 base::VKEY_W, views::Event::EF_CONTROL_DOWN)); | 286 base::VKEY_F4, views::Event::EF_CONTROL_DOWN)); |
| 287 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); | 287 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); |
| 288 #endif | 288 #endif |
| 289 } | 289 } |
| OLD | NEW |