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

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

Issue 2621323003: Remove the extra separator appears on the right side of the shelf (Closed)
Patch Set: 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 tray_cast_(nullptr), 217 tray_cast_(nullptr),
218 tray_date_(nullptr), 218 tray_date_(nullptr),
219 tray_tiles_(nullptr), 219 tray_tiles_(nullptr),
220 tray_system_info_(nullptr), 220 tray_system_info_(nullptr),
221 tray_update_(nullptr), 221 tray_update_(nullptr),
222 screen_capture_tray_item_(nullptr), 222 screen_capture_tray_item_(nullptr),
223 screen_share_tray_item_(nullptr) { 223 screen_share_tray_item_(nullptr) {
224 if (MaterialDesignController::IsShelfMaterial()) { 224 if (MaterialDesignController::IsShelfMaterial()) {
225 SetInkDropMode(InkDropMode::ON); 225 SetInkDropMode(InkDropMode::ON);
226 SetContentsBackground(false); 226 SetContentsBackground(false);
227
228 // Since |system_tray| locates on the right most position, no separator is
229 // required on its right side.
230 set_separator_visibility(false);
227 } else { 231 } else {
228 SetContentsBackground(true); 232 SetContentsBackground(true);
229 } 233 }
230 } 234 }
231 235
232 SystemTray::~SystemTray() { 236 SystemTray::~SystemTray() {
233 // Destroy any child views that might have back pointers before ~View(). 237 // Destroy any child views that might have back pointers before ~View().
234 activation_observer_.reset(); 238 activation_observer_.reset();
235 key_event_watcher_.reset(); 239 key_event_watcher_.reset();
236 system_bubble_.reset(); 240 system_bubble_.reset();
(...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 .work_area() 913 .work_area()
910 .height(); 914 .height();
911 if (work_area_height > 0) { 915 if (work_area_height > 0) {
912 UMA_HISTOGRAM_CUSTOM_COUNTS( 916 UMA_HISTOGRAM_CUSTOM_COUNTS(
913 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", 917 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
914 100 * bubble_view->height() / work_area_height, 1, 300, 100); 918 100 * bubble_view->height() / work_area_height, 1, 300, 100);
915 } 919 }
916 } 920 }
917 921
918 } // namespace ash 922 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/session/logout_button_tray.cc ('k') | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698