diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 10:04:04 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 10:04:04 +0000 |
| commit | 78550a8bbcbe2bf796a04c083225ff596d6cd57f (patch) | |
| tree | 428461982eb2b58d5db429c5fef2b08159db80b6 /ash/wm/app_list_controller.cc | |
| parent | 354d091834a8474682f3d32f0cf5a492fe1271eb (diff) | |
| download | chromium_src-78550a8bbcbe2bf796a04c083225ff596d6cd57f.zip chromium_src-78550a8bbcbe2bf796a04c083225ff596d6cd57f.tar.gz chromium_src-78550a8bbcbe2bf796a04c083225ff596d6cd57f.tar.bz2 | |
Rename BubbleBorder::ArrowLocation to Arrow; etc.
Rename ArrowLocation and ArrowLocationMask for brevity.
Rename accessors and identifiers to match.
Inline the only use of GetInsetsForArrowLocation.
Rewrite is_arrow_on_[left|top] as one-liners.
Combine previously too-long lines; Minor other cleanup.
BUG=None (cleanup)
TEST=None; unit tests and no bubble regressions.
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14105005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index 37aff49..7fcf76c 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -42,8 +42,7 @@ ui::Layer* GetLayer(views::Widget* widget) { } // Gets arrow location based on shelf alignment. -views::BubbleBorder::ArrowLocation GetBubbleArrowLocation( - aura::Window* window) { +views::BubbleBorder::Arrow GetBubbleArrow(aura::Window* window) { DCHECK(Shell::HasInstance()); return ShelfLayoutManager::ForLauncher(window)-> SelectValueForShelfAlignment( @@ -126,7 +125,7 @@ void AppListController::SetVisible(bool visible, aura::Window* window) { pagination_model_.get(), Launcher::ForWindow(container)->GetAppListButtonView(), gfx::Point(), - GetBubbleArrowLocation(container), + GetBubbleArrow(container), true /* border_accepts_events */); SetView(view); } @@ -288,10 +287,8 @@ void AppListController::OnWidgetDestroying(views::Widget* widget) { //////////////////////////////////////////////////////////////////////////////// // AppListController, ShellObserver implementation: void AppListController::OnShelfAlignmentChanged(aura::RootWindow* root_window) { - if (view_) { - view_->SetBubbleArrowLocation(GetBubbleArrowLocation( - view_->GetWidget()->GetNativeView())); - } + if (view_) + view_->SetBubbleArrow(GetBubbleArrow(view_->GetWidget()->GetNativeView())); } //////////////////////////////////////////////////////////////////////////////// |