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

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

Issue 2618383003: Remove the extra separator appears on the right side of the shelf (Closed)
Patch Set: address nits Created 3 years, 11 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/system_tray.h" 5 #include "ash/common/system/tray/system_tray.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 tray_date_(nullptr), 214 tray_date_(nullptr),
215 tray_network_(nullptr), 215 tray_network_(nullptr),
216 tray_tiles_(nullptr), 216 tray_tiles_(nullptr),
217 tray_system_info_(nullptr), 217 tray_system_info_(nullptr),
218 tray_update_(nullptr), 218 tray_update_(nullptr),
219 screen_capture_tray_item_(nullptr), 219 screen_capture_tray_item_(nullptr),
220 screen_share_tray_item_(nullptr) { 220 screen_share_tray_item_(nullptr) {
221 if (MaterialDesignController::IsShelfMaterial()) { 221 if (MaterialDesignController::IsShelfMaterial()) {
222 SetInkDropMode(InkDropMode::ON); 222 SetInkDropMode(InkDropMode::ON);
223 SetContentsBackground(false); 223 SetContentsBackground(false);
224
225 // Since |system_tray| locates on the right most position, no separator is
226 // required on its right side.
227 set_separator_visibility(false);
224 } else { 228 } else {
225 SetContentsBackground(true); 229 SetContentsBackground(true);
226 } 230 }
227 } 231 }
228 232
229 SystemTray::~SystemTray() { 233 SystemTray::~SystemTray() {
230 // Destroy any child views that might have back pointers before ~View(). 234 // Destroy any child views that might have back pointers before ~View().
231 activation_observer_.reset(); 235 activation_observer_.reset();
232 key_event_watcher_.reset(); 236 key_event_watcher_.reset();
233 system_bubble_.reset(); 237 system_bubble_.reset();
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 .work_area() 899 .work_area()
896 .height(); 900 .height();
897 if (work_area_height > 0) { 901 if (work_area_height > 0) {
898 UMA_HISTOGRAM_CUSTOM_COUNTS( 902 UMA_HISTOGRAM_CUSTOM_COUNTS(
899 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", 903 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
900 100 * bubble_view->height() / work_area_height, 1, 300, 100); 904 100 * bubble_view->height() / work_area_height, 1, 300, 100);
901 } 905 }
902 } 906 }
903 907
904 } // namespace ash 908 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698