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

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

Issue 2702583002: Remove the extra separator appears beside overview tray (Closed)
Patch Set: fix comments 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 | « ash/common/system/overview/overview_button_tray.cc ('k') | 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 (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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 224
225 // Since |system_tray| locates on the right most position, no separator is 225 // Since user avatar is on the right hand side of System tray of a
226 // required on its right side. 226 // horizontal shelf and that is sufficient to indicate separation, no
227 // separator is required.
227 set_separator_visibility(false); 228 set_separator_visibility(false);
228 } else { 229 } else {
229 SetContentsBackground(true); 230 SetContentsBackground(true);
230 } 231 }
231 } 232 }
232 233
233 SystemTray::~SystemTray() { 234 SystemTray::~SystemTray() {
234 // Destroy any child views that might have back pointers before ~View(). 235 // Destroy any child views that might have back pointers before ~View().
235 activation_observer_.reset(); 236 activation_observer_.reset();
236 key_event_watcher_.reset(); 237 key_event_watcher_.reset();
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 .work_area() 890 .work_area()
890 .height(); 891 .height();
891 if (work_area_height > 0) { 892 if (work_area_height > 0) {
892 UMA_HISTOGRAM_CUSTOM_COUNTS( 893 UMA_HISTOGRAM_CUSTOM_COUNTS(
893 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", 894 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
894 100 * bubble_view->height() / work_area_height, 1, 300, 100); 895 100 * bubble_view->height() / work_area_height, 1, 300, 100);
895 } 896 }
896 } 897 }
897 898
898 } // namespace ash 899 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/overview/overview_button_tray.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698