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

Side by Side Diff: chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc

Issue 33913003: Remove kNaturalScrollDefault. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chromeos/chromeos_switches.h » ('j') | 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/views/ash/tab_scrubber.h" 5 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
6 6
7 #include "ash/display/event_transformation_handler.h" 7 #include "ash/display/event_transformation_handler.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 22 matching lines...) Expand all
33 namespace { 33 namespace {
34 34
35 class TabScrubberTest : public InProcessBrowserTest, 35 class TabScrubberTest : public InProcessBrowserTest,
36 public TabStripModelObserver { 36 public TabStripModelObserver {
37 public: 37 public:
38 TabScrubberTest() 38 TabScrubberTest()
39 : target_index_(-1) { 39 : target_index_(-1) {
40 } 40 }
41 41
42 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 42 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
43 #if defined(OS_CHROMEOS)
44 command_line->AppendSwitch(chromeos::switches::kNaturalScrollDefault);
45 #endif
46 command_line->AppendSwitch(switches::kOpenAsh); 43 command_line->AppendSwitch(switches::kOpenAsh);
47 } 44 }
48 45
49 virtual void SetUpOnMainThread() OVERRIDE { 46 virtual void SetUpOnMainThread() OVERRIDE {
50 TabScrubber::GetInstance()->set_activation_delay(0); 47 TabScrubber::GetInstance()->set_activation_delay(0);
51 48
52 // Disable external monitor scaling of coordinates. 49 // Disable external monitor scaling of coordinates.
53 ash::Shell* shell = ash::Shell::GetInstance(); 50 ash::Shell* shell = ash::Shell::GetInstance();
54 shell->event_transformation_handler()->set_transformation_mode( 51 shell->event_transformation_handler()->set_transformation_mode(
55 ash::EventTransformationHandler::TRANSFORM_NONE); 52 ash::EventTransformationHandler::TRANSFORM_NONE);
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) { 411 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) {
415 AddTabs(browser(), 1); 412 AddTabs(browser(), 1);
416 413
417 SendScrubEvent(browser(), 0); 414 SendScrubEvent(browser(), 0);
418 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending()); 415 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
419 browser()->window()->Close(); 416 browser()->window()->Close();
420 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending()); 417 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending());
421 } 418 }
422 419
423 #endif // defined(OS_CHROMEOS) 420 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698