Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(600)

Side by Side Diff: chrome/browser/ui/browser_unittest.cc

Issue 10444047: Modify Browser::IsReservedCommandOrKey() to make sure it returns false when an Ash shortcut is pres… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #include "chrome/app/chrome_command_ids.h"
7 #include "chrome/test/base/browser_with_test_window_test.h" 8 #include "chrome/test/base/browser_with_test_window_test.h"
9 #include "content/public/browser/native_web_keyboard_event.h"
8 10
9 // Various assertions around setting show state. 11 // Various assertions around setting show state.
10 TEST_F(BrowserWithTestWindowTest, GetSavedWindowShowState) { 12 TEST_F(BrowserWithTestWindowTest, GetSavedWindowShowState) {
11 // Default show state is SHOW_STATE_DEFAULT. 13 // Default show state is SHOW_STATE_DEFAULT.
12 EXPECT_EQ(ui::SHOW_STATE_DEFAULT, browser()->GetSavedWindowShowState()); 14 EXPECT_EQ(ui::SHOW_STATE_DEFAULT, browser()->GetSavedWindowShowState());
13 15
14 // Explicitly specifying a state should stick though. 16 // Explicitly specifying a state should stick though.
15 browser()->set_show_state(ui::SHOW_STATE_MAXIMIZED); 17 browser()->set_show_state(ui::SHOW_STATE_MAXIMIZED);
16 EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, browser()->GetSavedWindowShowState()); 18 EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, browser()->GetSavedWindowShowState());
17 browser()->set_show_state(ui::SHOW_STATE_NORMAL); 19 browser()->set_show_state(ui::SHOW_STATE_NORMAL);
18 EXPECT_EQ(ui::SHOW_STATE_NORMAL, browser()->GetSavedWindowShowState()); 20 EXPECT_EQ(ui::SHOW_STATE_NORMAL, browser()->GetSavedWindowShowState());
19 browser()->set_show_state(ui::SHOW_STATE_MINIMIZED); 21 browser()->set_show_state(ui::SHOW_STATE_MINIMIZED);
20 EXPECT_EQ(ui::SHOW_STATE_MINIMIZED, browser()->GetSavedWindowShowState()); 22 EXPECT_EQ(ui::SHOW_STATE_MINIMIZED, browser()->GetSavedWindowShowState());
21 browser()->set_show_state(ui::SHOW_STATE_FULLSCREEN); 23 browser()->set_show_state(ui::SHOW_STATE_FULLSCREEN);
22 EXPECT_EQ(ui::SHOW_STATE_FULLSCREEN, browser()->GetSavedWindowShowState()); 24 EXPECT_EQ(ui::SHOW_STATE_FULLSCREEN, browser()->GetSavedWindowShowState());
23 } 25 }
26
27 TEST_F(BrowserWithTestWindowTest, IsReservedCommandOrKey) {
28 #if defined(OS_CHROMEOS)
29 const content::NativeWebKeyboardEvent event(ui::ET_KEY_PRESSED,
30 false,
31 ui::VKEY_F1,
32 0,
33 base::Time::Now().ToDoubleT());
34 // F1-4 keys are reserved on Chrome OS.
35 EXPECT_TRUE(browser()->IsReservedCommandOrKey(IDC_BACK, event));
36 // ..unless |command_id| is -1. crbug.com/122978
37 EXPECT_FALSE(browser()->IsReservedCommandOrKey(-1, event));
38 #endif
39 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698