Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(836)

Side by Side Diff: ash/system/tray/tray_background_view.cc

Issue 12310022: More flexibility in BubbleBorder arrow rendering. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Now with more user choice: bool -> enum. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/tray/tray_background_view.h" 5 #include "ash/system/tray/tray_background_view.h"
6 6
7 #include "ash/launcher/background_animator.h" 7 #include "ash/launcher/background_animator.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/screen_ash.h" 9 #include "ash/screen_ash.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 NOTREACHED(); 381 NOTREACHED();
382 return TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM; 382 return TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM;
383 } 383 }
384 384
385 void TrayBackgroundView::UpdateBubbleViewArrow( 385 void TrayBackgroundView::UpdateBubbleViewArrow(
386 views::TrayBubbleView* bubble_view) { 386 views::TrayBubbleView* bubble_view) {
387 aura::RootWindow* root_window = 387 aura::RootWindow* root_window =
388 bubble_view->GetWidget()->GetNativeView()->GetRootWindow(); 388 bubble_view->GetWidget()->GetNativeView()->GetRootWindow();
389 ash::internal::ShelfLayoutManager* shelf = 389 ash::internal::ShelfLayoutManager* shelf =
390 ash::GetRootWindowController(root_window)->shelf(); 390 ash::GetRootWindowController(root_window)->shelf();
391 bubble_view->SetPaintArrow(shelf->IsVisible()); 391 if (shelf->IsVisible())
msw 2013/02/21 07:29:29 nit: move the condition into the call as a ternary
dewittj 2013/02/21 19:13:57 Done.
392 bubble_view->SetArrowPaintType(views::BubbleBorder::PAINT_NORMAL);
393 else
394 bubble_view->SetArrowPaintType(views::BubbleBorder::PAINT_TRANSPARENT);
392 } 395 }
393 396
394 } // namespace internal 397 } // namespace internal
395 } // namespace ash 398 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698