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

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

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray/throbber_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/system_tray.h" 5 #include "ash/system/tray/system_tray.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/metrics/user_metrics_recorder.h" 8 #include "ash/metrics/user_metrics_recorder.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 system_bubble_->bubble()->RestartAutoCloseTimer(); 659 system_bubble_->bubble()->RestartAutoCloseTimer();
660 } 660 }
661 661
662 base::string16 SystemTray::GetAccessibleNameForBubble() { 662 base::string16 SystemTray::GetAccessibleNameForBubble() {
663 return GetAccessibleNameForTray(); 663 return GetAccessibleNameForTray();
664 } 664 }
665 665
666 gfx::Rect SystemTray::GetAnchorRect( 666 gfx::Rect SystemTray::GetAnchorRect(
667 views::Widget* anchor_widget, 667 views::Widget* anchor_widget,
668 TrayBubbleView::AnchorType anchor_type, 668 TrayBubbleView::AnchorType anchor_type,
669 TrayBubbleView::AnchorAlignment anchor_alignment) { 669 TrayBubbleView::AnchorAlignment anchor_alignment) const {
670 return GetBubbleAnchorRect(anchor_widget, anchor_type, anchor_alignment); 670 return GetBubbleAnchorRect(anchor_widget, anchor_type, anchor_alignment);
671 } 671 }
672 672
673 void SystemTray::HideBubble(const TrayBubbleView* bubble_view) { 673 void SystemTray::HideBubble(const TrayBubbleView* bubble_view) {
674 HideBubbleWithView(bubble_view); 674 HideBubbleWithView(bubble_view);
675 } 675 }
676 676
677 views::View* SystemTray::GetTrayItemViewForTest(SystemTrayItem* item) { 677 views::View* SystemTray::GetTrayItemViewForTest(SystemTrayItem* item) {
678 std::map<SystemTrayItem*, views::View*>::iterator it = 678 std::map<SystemTrayItem*, views::View*>::iterator it =
679 tray_item_map_.find(item); 679 tray_item_map_.find(item);
(...skipping 28 matching lines...) Expand all
708 system_bubble_.reset(); 708 system_bubble_.reset();
709 // When closing a system bubble with the alternate shelf layout, we need to 709 // When closing a system bubble with the alternate shelf layout, we need to
710 // turn off the active tinting of the shelf. 710 // turn off the active tinting of the shelf.
711 if (full_system_tray_menu_) { 711 if (full_system_tray_menu_) {
712 SetDrawBackgroundAsActive(false); 712 SetDrawBackgroundAsActive(false);
713 full_system_tray_menu_ = false; 713 full_system_tray_menu_ = false;
714 } 714 }
715 } 715 }
716 716
717 } // namespace ash 717 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray/throbber_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698