diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 04:16:11 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 04:16:11 +0000 |
| commit | fec31fcc7efd96ae2e46d71e24d24b1ef9e8989b (patch) | |
| tree | 76f0c05cf2ca1cfea464baff614653dee0f41740 /athena | |
| parent | 06434aeaddb38335e5eacc9069bf12320bed66ba (diff) | |
| download | chromium_src-fec31fcc7efd96ae2e46d71e24d24b1ef9e8989b.zip chromium_src-fec31fcc7efd96ae2e46d71e24d24b1ef9e8989b.tar.gz chromium_src-fec31fcc7efd96ae2e46d71e24d24b1ef9e8989b.tar.bz2 | |
athena: Use overlay scrollbars.
Use overlay scrollbars in athena, for both views and content.
BUG=398883
R=oshima@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/428583003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/main/DEPS | 1 | ||||
| -rw-r--r-- | athena/main/athena_main.cc | 2 | ||||
| -rw-r--r-- | athena/main/athena_main.gyp | 1 | ||||
| -rw-r--r-- | athena/main/debug/network_selector.cc | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/athena/main/DEPS b/athena/main/DEPS index bde26d8..9613948 100644 --- a/athena/main/DEPS +++ b/athena/main/DEPS @@ -20,6 +20,7 @@ include_rules = [ "+ui/events", "+ui/gl", "+ui/keyboard", + "+ui/native_theme", "+ui/views", "+ui/wm/core", ] diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc index d50330e..321b647 100644 --- a/athena/main/athena_main.cc +++ b/athena/main/athena_main.cc @@ -29,6 +29,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller_observer.h" +#include "ui/native_theme/native_theme_switches.h" #include "ui/wm/core/visibility_controller.h" namespace { @@ -85,6 +86,7 @@ class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate { // Force showing in the experimental app-list view. command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList); + command_line->AppendSwitch(switches::kEnableOverlayScrollbar); base::FilePath app_dir = base::FilePath::FromUTF8Unsafe( command_line->HasSwitch(extensions::switches::kAppShellAppPath) diff --git a/athena/main/athena_main.gyp b/athena/main/athena_main.gyp index 6de9d4b..c21e4ae 100644 --- a/athena/main/athena_main.gyp +++ b/athena/main/athena_main.gyp @@ -32,6 +32,7 @@ '../../ui/app_list/app_list.gyp:app_list', '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos', '../../ui/keyboard/keyboard.gyp:keyboard', + '../../ui/native_theme/native_theme.gyp:native_theme', '../../ui/views/views.gyp:views', '../../url/url.gyp:url_lib', ], diff --git a/athena/main/debug/network_selector.cc b/athena/main/debug/network_selector.cc index 39ef9a8..9102e10 100644 --- a/athena/main/debug/network_selector.cc +++ b/athena/main/debug/network_selector.cc @@ -33,6 +33,7 @@ #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/scroll_view.h" +#include "ui/views/controls/scrollbar/overlay_scroll_bar.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/fill_layout.h" @@ -376,6 +377,7 @@ class NetworkSelector : public ui::NetworkListDelegate, scroller_->SetContents(scroll_content_); scroller_->ClipHeightTo(kListHeight, kListHeight); + scroller_->SetVerticalScrollBar(new views::OverlayScrollBar(false)); background_view_->AddChildView(scroller_); background_view_->Layout(); |