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

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 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
« no previous file with comments | « ash/system/overview/overview_button_tray.h ('k') | ash/system/palette/palette_tray.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 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/overview/overview_button_tray.h" 5 #include "ash/system/overview/overview_button_tray.h"
6 6
7 #include "ash/resources/vector_icons/vector_icons.h" 7 #include "ash/resources/vector_icons/vector_icons.h"
8 #include "ash/session/session_controller.h" 8 #include "ash/session/session_controller.h"
9 #include "ash/shelf/shelf_constants.h" 9 #include "ash/shelf/shelf_constants.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_port.h" 11 #include "ash/shell_port.h"
12 #include "ash/strings/grit/ash_strings.h" 12 #include "ash/strings/grit/ash_strings.h"
13 #include "ash/system/tray/tray_constants.h" 13 #include "ash/system/tray/tray_constants.h"
14 #include "ash/system/tray/tray_container.h" 14 #include "ash/system/tray/tray_container.h"
15 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 15 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
16 #include "ash/wm/mru_window_tracker.h" 16 #include "ash/wm/mru_window_tracker.h"
17 #include "ash/wm/overview/window_selector_controller.h" 17 #include "ash/wm/overview/window_selector_controller.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/gfx/paint_vector_icon.h" 19 #include "ui/gfx/paint_vector_icon.h"
20 #include "ui/views/border.h" 20 #include "ui/views/border.h"
21 #include "ui/views/controls/image_view.h" 21 #include "ui/views/controls/image_view.h"
22 #include "ui/wm/core/window_util.h" 22 #include "ui/wm/core/window_util.h"
23 23
24 namespace ash { 24 namespace ash {
25 25
26 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf) 26 OverviewButtonTray::OverviewButtonTray(Shelf* shelf)
27 : TrayBackgroundView(wm_shelf), 27 : TrayBackgroundView(shelf),
28 icon_(new views::ImageView()), 28 icon_(new views::ImageView()),
29 scoped_session_observer_(this) { 29 scoped_session_observer_(this) {
30 SetInkDropMode(InkDropMode::ON); 30 SetInkDropMode(InkDropMode::ON);
31 31
32 gfx::ImageSkia image = 32 gfx::ImageSkia image =
33 gfx::CreateVectorIcon(kShelfOverviewIcon, kShelfIconColor); 33 gfx::CreateVectorIcon(kShelfOverviewIcon, kShelfIconColor);
34 icon_->SetImage(image); 34 icon_->SetImage(image);
35 const int vertical_padding = (kTrayItemSize - image.height()) / 2; 35 const int vertical_padding = (kTrayItemSize - image.height()) / 2;
36 const int horizontal_padding = (kTrayItemSize - image.width()) / 2; 36 const int horizontal_padding = (kTrayItemSize - image.width()) / 2;
37 icon_->SetBorder(views::CreateEmptyBorder( 37 icon_->SetBorder(views::CreateEmptyBorder(
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 SetVisible( 128 SetVisible(
129 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && 129 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
130 session_controller->IsActiveUserSessionStarted() && 130 session_controller->IsActiveUserSessionStarted() &&
131 !session_controller->IsScreenLocked() && 131 !session_controller->IsScreenLocked() &&
132 session_controller->GetSessionState() == 132 session_controller->GetSessionState() ==
133 session_manager::SessionState::ACTIVE && 133 session_manager::SessionState::ACTIVE &&
134 !session_controller->IsKioskSession()); 134 !session_controller->IsKioskSession());
135 } 135 }
136 136
137 } // namespace ash 137 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/overview/overview_button_tray.h ('k') | ash/system/palette/palette_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698