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

Side by Side Diff: ash/common/system/tray/tray_popup_utils.cc

Issue 2686703002: Remove TrayPopupLabelButton (a pre-MD class) and its assets. (Closed)
Patch Set: nit Created 3 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/common/system/tray/tray_popup_utils.h" 5 #include "ash/common/system/tray/tray_popup_utils.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/common/ash_constants.h" 10 #include "ash/common/ash_constants.h"
11 #include "ash/common/ash_view_ids.h" 11 #include "ash/common/ash_view_ids.h"
12 #include "ash/common/material_design/material_design_controller.h" 12 #include "ash/common/material_design/material_design_controller.h"
13 #include "ash/common/session/session_state_delegate.h" 13 #include "ash/common/session/session_state_delegate.h"
14 #include "ash/common/system/tray/fixed_sized_image_view.h" 14 #include "ash/common/system/tray/fixed_sized_image_view.h"
15 #include "ash/common/system/tray/size_range_layout.h" 15 #include "ash/common/system/tray/size_range_layout.h"
16 #include "ash/common/system/tray/tray_constants.h" 16 #include "ash/common/system/tray/tray_constants.h"
17 #include "ash/common/system/tray/tray_popup_item_style.h" 17 #include "ash/common/system/tray/tray_popup_item_style.h"
18 #include "ash/common/system/tray/tray_popup_label_button.h"
19 #include "ash/common/system/tray/tray_popup_label_button_border.h"
20 #include "ash/common/wm_shell.h" 18 #include "ash/common/wm_shell.h"
21 #include "base/memory/ptr_util.h" 19 #include "base/memory/ptr_util.h"
22 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/views/animation/flood_fill_ink_drop_ripple.h" 21 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
24 #include "ui/views/animation/ink_drop_highlight.h" 22 #include "ui/views/animation/ink_drop_highlight.h"
25 #include "ui/views/animation/ink_drop_impl.h" 23 #include "ui/views/animation/ink_drop_impl.h"
26 #include "ui/views/animation/ink_drop_mask.h" 24 #include "ui/views/animation/ink_drop_mask.h"
27 #include "ui/views/animation/square_ink_drop_ripple.h" 25 #include "ui/views/animation/square_ink_drop_ripple.h"
28 #include "ui/views/background.h" 26 #include "ui/views/background.h"
29 #include "ui/views/border.h" 27 #include "ui/views/border.h"
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) { 443 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
446 // TODO(tdanderson): Consider moving this into WmShell, or introduce a 444 // TODO(tdanderson): Consider moving this into WmShell, or introduce a
447 // CanShowSettings() method in each delegate type that has a 445 // CanShowSettings() method in each delegate type that has a
448 // ShowSettings() method. 446 // ShowSettings() method.
449 return status != LoginStatus::NOT_LOGGED_IN && 447 return status != LoginStatus::NOT_LOGGED_IN &&
450 status != LoginStatus::LOCKED && 448 status != LoginStatus::LOCKED &&
451 !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen(); 449 !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
452 } 450 }
453 451
454 } // namespace ash 452 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_popup_label_button_border.cc ('k') | ash/common/system/tray_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698