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

Side by Side Diff: ash/common/system/overview/overview_button_tray.cc

Issue 2723843002: Remove non-MD code from TrayBackgroundView (Closed)
Patch Set: Rebased Created 3 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
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/common/system/overview/overview_button_tray.h" 5 #include "ash/common/system/overview/overview_button_tray.h"
6 6
7 #include "ash/common/session/session_state_delegate.h" 7 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/common/shelf/shelf_constants.h" 8 #include "ash/common/shelf/shelf_constants.h"
9 #include "ash/common/system/tray/system_tray_delegate.h" 9 #include "ash/common/system/tray/system_tray_delegate.h"
10 #include "ash/common/system/tray/tray_constants.h" 10 #include "ash/common/system/tray/tray_constants.h"
11 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 11 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
12 #include "ash/common/wm/overview/window_selector_controller.h" 12 #include "ash/common/wm/overview/window_selector_controller.h"
13 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
14 #include "ash/resources/vector_icons/vector_icons.h" 14 #include "ash/resources/vector_icons/vector_icons.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/strings/grit/ash_strings.h" 16 #include "ash/strings/grit/ash_strings.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/gfx/paint_vector_icon.h" 18 #include "ui/gfx/paint_vector_icon.h"
19 #include "ui/views/border.h" 19 #include "ui/views/border.h"
20 #include "ui/views/controls/image_view.h" 20 #include "ui/views/controls/image_view.h"
21 21
22 namespace ash { 22 namespace ash {
23 23
24 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf) 24 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf)
25 : TrayBackgroundView(wm_shelf), icon_(new views::ImageView()) { 25 : TrayBackgroundView(wm_shelf, true), icon_(new views::ImageView()) {
26 SetInkDropMode(InkDropMode::ON); 26 SetInkDropMode(InkDropMode::ON);
27 SetContentsBackground(false);
28 27
29 icon_->SetImage(CreateVectorIcon(kShelfOverviewIcon, kShelfIconColor)); 28 icon_->SetImage(CreateVectorIcon(kShelfOverviewIcon, kShelfIconColor));
30 SetIconBorderForShelfAlignment(); 29 SetIconBorderForShelfAlignment();
31 tray_container()->AddChildView(icon_); 30 tray_container()->AddChildView(icon_);
32 31
33 // Since OverviewButtonTray is located on the rightmost position of a 32 // Since OverviewButtonTray is located on the rightmost position of a
34 // horizontal shelf, no separator is required. 33 // horizontal shelf, no separator is required.
35 set_separator_visibility(false); 34 set_separator_visibility(false);
36 35
37 Shell::GetInstance()->AddShellObserver(this); 36 Shell::GetInstance()->AddShellObserver(this);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 !session_state_delegate->IsScreenLocked() && 119 !session_state_delegate->IsScreenLocked() &&
121 session_state_delegate->GetSessionState() == 120 session_state_delegate->GetSessionState() ==
122 session_manager::SessionState::ACTIVE && 121 session_manager::SessionState::ACTIVE &&
123 shell->system_tray_delegate()->GetUserLoginStatus() != 122 shell->system_tray_delegate()->GetUserLoginStatus() !=
124 LoginStatus::KIOSK_APP && 123 LoginStatus::KIOSK_APP &&
125 shell->system_tray_delegate()->GetUserLoginStatus() != 124 shell->system_tray_delegate()->GetUserLoginStatus() !=
126 LoginStatus::ARC_KIOSK_APP); 125 LoginStatus::ARC_KIOSK_APP);
127 } 126 }
128 127
129 } // namespace ash 128 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698