| Index: athena/main/athena_launcher.cc
|
| diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
|
| index c94d6715755dfdef1e5c56bc76aa37e00bed1a03..d99b064186d854cd65299592446ebeb93b22f8e0 100644
|
| --- a/athena/main/athena_launcher.cc
|
| +++ b/athena/main/athena_launcher.cc
|
| @@ -24,6 +24,7 @@
|
| #include "athena/wm/public/window_manager.h"
|
| #include "base/command_line.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/public/common/content_switches.h"
|
| #include "ui/app_list/app_list_switches.h"
|
| #include "ui/aura/window_property.h"
|
| #include "ui/aura/window_tree_host.h"
|
| @@ -86,6 +87,9 @@ void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner) {
|
| command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
|
| command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
|
|
|
| + // Enable vertical overscroll.
|
| + command_line->AppendSwitchASCII(switches::kScrollEndEffect, "1");
|
| +
|
| #if defined(USE_X11)
|
| ui::TouchFactory::SetTouchDeviceListFromCommandLine();
|
| #endif
|
|
|