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

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

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 7 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
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"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/message_loop_proxy.h" 12 #include "base/message_loop_proxy.h"
13 #include "chrome/browser/ui/browser_tabstrip.h" 13 #include "chrome/browser/ui/browser_tabstrip.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 15 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
16 #include "chrome/browser/ui/views/frame/browser_view.h" 16 #include "chrome/browser/ui/views/frame/browser_view.h"
17 #include "chrome/browser/ui/views/tabs/tab.h" 17 #include "chrome/browser/ui/views/tabs/tab.h"
18 #include "chrome/browser/ui/views/tabs/tab_strip.h" 18 #include "chrome/browser/ui/views/tabs/tab_strip.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/test/base/in_process_browser_test.h" 20 #include "chrome/test/base/in_process_browser_test.h"
21 #include "chrome/test/base/ui_test_utils.h" 21 #include "chrome/test/base/ui_test_utils.h"
22 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
23 #include "content/public/browser/notification_service.h" 23 #include "content/public/browser/notification_service.h"
24 #include "content/public/common/url_constants.h" 24 #include "content/public/common/url_constants.h"
25 #include "content/public/test/test_utils.h" 25 #include "content/public/test/test_utils.h"
26 #include "ui/aura/test/event_generator.h" 26 #include "ui/aura/test/event_generator.h"
27 #include "ui/aura/window.h" 27 #include "ui/aura/window.h"
28 #include "ui/base/events/event_utils.h" 28 #include "ui/base/events/event_utils.h"
29 29
30 #if defined(OS_CHROMEOS)
31 #include "chromeos/chromeos_switches.h"
32 #endif
33
30 namespace { 34 namespace {
31 35
32 class TabScrubberTest : public InProcessBrowserTest, 36 class TabScrubberTest : public InProcessBrowserTest,
33 public TabStripModelObserver { 37 public TabStripModelObserver {
34 public: 38 public:
35 TabScrubberTest() 39 TabScrubberTest()
36 : target_index_(-1) { 40 : target_index_(-1) {
37 } 41 }
38 42
39 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 43 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
40 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
41 command_line->AppendSwitch(switches::kNaturalScrollDefault); 45 command_line->AppendSwitch(chromeos::switches::kNaturalScrollDefault);
42 #endif 46 #endif
43 command_line->AppendSwitch(switches::kOpenAsh); 47 command_line->AppendSwitch(switches::kOpenAsh);
44 } 48 }
45 49
46 virtual void SetUpOnMainThread() OVERRIDE { 50 virtual void SetUpOnMainThread() OVERRIDE {
47 TabScrubber::GetInstance()->set_activation_delay(0); 51 TabScrubber::GetInstance()->set_activation_delay(0);
48 52
49 // Disable external monitor scaling of coordinates. 53 // Disable external monitor scaling of coordinates.
50 ash::Shell* shell = ash::Shell::GetInstance(); 54 ash::Shell* shell = ash::Shell::GetInstance();
51 shell->event_transformation_handler()->set_transformation_mode( 55 shell->event_transformation_handler()->set_transformation_mode(
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) { 415 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) {
412 AddTabs(browser(), 1); 416 AddTabs(browser(), 1);
413 417
414 SendScrubEvent(browser(), 0); 418 SendScrubEvent(browser(), 0);
415 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending()); 419 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
416 browser()->window()->Close(); 420 browser()->window()->Close();
417 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending()); 421 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending());
418 } 422 }
419 423
420 #endif // OS_CHROMEOS 424 #endif // OS_CHROMEOS
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/webui/chromeos/drive_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698