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

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

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 years 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_item.h ('k') | ash/system/tray/tray_background_view.cc » ('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_item.h" 5 #include "ash/system/tray/system_tray_item.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } 78 }
79 79
80 void SystemTrayItem::HideNotificationView() { 80 void SystemTrayItem::HideNotificationView() {
81 system_tray()->HideNotificationView(this); 81 system_tray()->HideNotificationView(this);
82 } 82 }
83 83
84 bool SystemTrayItem::ShouldHideArrow() const { 84 bool SystemTrayItem::ShouldHideArrow() const {
85 return false; 85 return false;
86 } 86 }
87 87
88 bool SystemTrayItem::ShouldShowLauncher() const { 88 bool SystemTrayItem::ShouldShowShelf() const {
89 return true; 89 return true;
90 } 90 }
91 91
92 } // namespace ash 92 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_item.h ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698