diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 22:42:43 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 22:42:43 +0000 |
| commit | 29fd54a3a414bc2607fee4718e25a1fbdbf9c896 (patch) | |
| tree | ffeaadec1f0b9eaf9733a2231697aceff5fe840f | |
| parent | 5ab478107610f898c4af1bfd35dbdc7bc994851a (diff) | |
| download | chromium_src-29fd54a3a414bc2607fee4718e25a1fbdbf9c896.zip chromium_src-29fd54a3a414bc2607fee4718e25a1fbdbf9c896.tar.gz chromium_src-29fd54a3a414bc2607fee4718e25a1fbdbf9c896.tar.bz2 | |
Merge 175817
> Enable natural scroll by default on OOBE.
>
> BUG=159192
> TEST=manual
>
> Review URL: https://chromiumcodereview.appspot.com/11827006
TBR=achuith@chromium.org
Review URL: https://codereview.chromium.org/11896048
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@178136 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/base_login_display_host.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc index cae593d..fcb3e32 100644 --- a/chrome/browser/chromeos/login/base_login_display_host.cc +++ b/chrome/browser/chromeos/login/base_login_display_host.cc @@ -44,6 +44,7 @@ #include "content/public/browser/notification_types.h" #include "googleurl/src/gurl.h" #include "ui/aura/window.h" +#include "ui/base/events/event_utils.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_element.h" @@ -402,6 +403,9 @@ void ShowLoginWizard(const std::string& first_screen_name, prefs->GetBoolean(prefs::kOwnerTapToClickEnabled)); } + ui::SetNaturalScroll(CommandLine::ForCurrentProcess()->HasSwitch( + switches::kNaturalScrollDefault)); + gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(size)); // Check whether we need to execute OOBE process. |