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

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

Issue 2702583002: Remove the extra separator appears beside overview tray (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | 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/common/system/overview/overview_button_tray.h" 5 #include "ash/common/system/overview/overview_button_tray.h"
6 6
7 #include "ash/common/material_design/material_design_controller.h" 7 #include "ash/common/material_design/material_design_controller.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shelf/shelf_constants.h" 9 #include "ash/common/shelf/shelf_constants.h"
10 #include "ash/common/shelf/wm_shelf_util.h" 10 #include "ash/common/shelf/wm_shelf_util.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 } else { 49 } else {
50 SetContentsBackground(true); 50 SetContentsBackground(true);
51 gfx::ImageSkia* image_non_md = 51 gfx::ImageSkia* image_non_md =
52 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 52 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
53 IDR_AURA_UBER_TRAY_OVERVIEW_MODE); 53 IDR_AURA_UBER_TRAY_OVERVIEW_MODE);
54 icon_->SetImage(image_non_md); 54 icon_->SetImage(image_non_md);
55 } 55 }
56 SetIconBorderForShelfAlignment(); 56 SetIconBorderForShelfAlignment();
57 tray_container()->AddChildView(icon_); 57 tray_container()->AddChildView(icon_);
58 58
59 // Since |overview_button_tray| locates on the right most position, no
60 // separator is required on its right side.
tdanderson 2017/02/16 20:25:03 How about something like "Since OverviewButtonTray
yiyix 2017/02/16 20:43:43 I have update all comments. Could you check it aga
61 set_separator_visibility(false);
62
59 WmShell::Get()->AddShellObserver(this); 63 WmShell::Get()->AddShellObserver(this);
60 WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(this); 64 WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(this);
61 } 65 }
62 66
63 OverviewButtonTray::~OverviewButtonTray() { 67 OverviewButtonTray::~OverviewButtonTray() {
64 WmShell::Get()->RemoveShellObserver(this); 68 WmShell::Get()->RemoveShellObserver(this);
65 WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(this); 69 WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(this);
66 } 70 }
67 71
68 void OverviewButtonTray::UpdateAfterLoginStatusChange(LoginStatus status) { 72 void OverviewButtonTray::UpdateAfterLoginStatusChange(LoginStatus status) {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 !session_state_delegate->IsScreenLocked() && 155 !session_state_delegate->IsScreenLocked() &&
152 session_state_delegate->GetSessionState() == 156 session_state_delegate->GetSessionState() ==
153 session_manager::SessionState::ACTIVE && 157 session_manager::SessionState::ACTIVE &&
154 shell->system_tray_delegate()->GetUserLoginStatus() != 158 shell->system_tray_delegate()->GetUserLoginStatus() !=
155 LoginStatus::KIOSK_APP && 159 LoginStatus::KIOSK_APP &&
156 shell->system_tray_delegate()->GetUserLoginStatus() != 160 shell->system_tray_delegate()->GetUserLoginStatus() !=
157 LoginStatus::ARC_KIOSK_APP); 161 LoginStatus::ARC_KIOSK_APP);
158 } 162 }
159 163
160 } // namespace ash 164 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698