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

Side by Side Diff: ash/system/session/logout_button_tray.cc

Issue 176883022: Shelf Cleanup (- binary files) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/session/logout_button_tray.h" 5 #include "ash/system/session/logout_button_tray.h"
6 6
7 #include "ash/shelf/shelf_types.h" 7 #include "ash/shelf/shelf_types.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/session/logout_confirmation_controller.h" 9 #include "ash/system/session/logout_confirmation_controller.h"
10 #include "ash/system/status_area_widget.h" 10 #include "ash/system/status_area_widget.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages)); 81 views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages));
82 border->SetPainter(false, views::Button::STATE_PRESSED, 82 border->SetPainter(false, views::Button::STATE_PRESSED,
83 views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages)); 83 views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages));
84 gfx::Insets insets = border->GetInsets(); 84 gfx::Insets insets = border->GetInsets();
85 insets += gfx::Insets(0, kLogoutButtonHorizontalExtraPadding, 85 insets += gfx::Insets(0, kLogoutButtonHorizontalExtraPadding,
86 0, kLogoutButtonHorizontalExtraPadding); 86 0, kLogoutButtonHorizontalExtraPadding);
87 border->set_insets(insets); 87 border->set_insets(insets);
88 SetBorder(border.PassAs<views::Border>()); 88 SetBorder(border.PassAs<views::Border>());
89 set_animate_on_state_change(false); 89 set_animate_on_state_change(false);
90 90
91 set_min_size(gfx::Size(0, GetShelfItemHeight())); 91 set_min_size(gfx::Size(0, kShelfItemHeight));
92 } 92 }
93 93
94 LogoutButton::~LogoutButton() { 94 LogoutButton::~LogoutButton() {
95 } 95 }
96 96
97 LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget) 97 LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget)
98 : TrayBackgroundView(status_area_widget), 98 : TrayBackgroundView(status_area_widget),
99 button_(NULL), 99 button_(NULL),
100 login_status_(user::LOGGED_IN_NONE), 100 login_status_(user::LOGGED_IN_NONE),
101 show_logout_button_in_tray_(false) { 101 show_logout_button_in_tray_(false) {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 } 159 }
160 160
161 void LogoutButtonTray::UpdateVisibility() { 161 void LogoutButtonTray::UpdateVisibility() {
162 SetVisible(show_logout_button_in_tray_ && 162 SetVisible(show_logout_button_in_tray_ &&
163 login_status_ != user::LOGGED_IN_NONE && 163 login_status_ != user::LOGGED_IN_NONE &&
164 login_status_ != user::LOGGED_IN_LOCKED); 164 login_status_ != user::LOGGED_IN_LOCKED);
165 } 165 }
166 166
167 } // namespace internal 167 } // namespace internal
168 } // namespace ash 168 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc ('k') | ash/system/status_area_widget_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698