diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 20:03:04 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 20:03:04 +0000 |
| commit | bcb93db51e916f338431a703bf108211c6420c89 (patch) | |
| tree | e5e1b01efee1d0006b1d55c1ea93077398f0c3d1 /ash/shell | |
| parent | 8467a39901a346bd655e906438c018ca78b7f994 (diff) | |
| download | chromium_src-bcb93db51e916f338431a703bf108211c6420c89.zip chromium_src-bcb93db51e916f338431a703bf108211c6420c89.tar.gz chromium_src-bcb93db51e916f338431a703bf108211c6420c89.tar.bz2 | |
Promotes touch-devices to ui_base so that ash can use it.
BUG=none
TEST=none
R=sadrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10449027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index c562f22..56d0b7f 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -32,6 +32,10 @@ #include "ui/views/focus/accelerator_handler.h" #include "ui/views/test/test_views_delegate.h" +#if defined(OS_LINUX) +#include "ui/base/touch/touch_factory.h" +#endif + namespace ash { namespace shell { void InitWindowTypeLauncher(); @@ -69,6 +73,9 @@ ShellBrowserMainParts::~ShellBrowserMainParts() { #if !defined(OS_MACOSX) void ShellBrowserMainParts::PreMainMessageLoopStart() { +#if defined(OS_LINUX) + ui::TouchFactory::SetTouchDeviceListFromCommandLine(); +#endif } #endif |