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

Side by Side Diff: chrome/browser/extensions/extension_input_ui_apitest.cc

Issue 9078005: Remove almost all remaining TOUCH_UIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 11 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/extensions/extension_input_api.h ('k') | chrome/common/logging_chrome_uitest.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/common/chrome_switches.h" 6 #include "chrome/common/chrome_switches.h"
7 7
8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, InputUI) { 8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, InputUI) {
9 CommandLine::ForCurrentProcess()->AppendSwitch( 9 CommandLine::ForCurrentProcess()->AppendSwitch(
10 switches::kEnableExperimentalExtensionApis); 10 switches::kEnableExperimentalExtensionApis);
11 #if defined(OS_CHROMEOS) && defined(TOUCH_UI) 11 #if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
12 ASSERT_TRUE(RunExtensionTest("input_ui/chromeos_touchui")) << message_; 12 ASSERT_TRUE(RunExtensionTest("input_ui/chromeos_virtual_keyboard")) <<
13 message_;
sky 2012/01/04 17:27:05 nit: this should be indented 4 spaces.
13 #else 14 #else
14 ASSERT_TRUE(RunExtensionTest("input_ui/other")) << message_; 15 ASSERT_TRUE(RunExtensionTest("input_ui/other")) << message_;
15 #endif 16 #endif
16 } 17 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_input_api.h ('k') | chrome/common/logging_chrome_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698