| Index: athena/main/athena_launcher.cc
|
| diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
|
| index f971ae67a4ab78c3ac92b006a25a7d130e6ddbe1..d0cd9c1e6331251ebd9a7c1a8b3b3a374f097542 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"
|
| @@ -92,6 +93,9 @@ void StartAthenaEnv(scoped_refptr<base::TaskRunner> blocking_task_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
|
|
|