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

Side by Side Diff: ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

Issue 2162153002: Added Ash.SystemMenu.DefaultView.VisibleItems histogram. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed the COUNT value from the SystemMenuDefaultViewRows enum. Created 4 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/chromeos/screen_security/screen_share_tray_item.h" 5 #include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/system/system_notifier.h" 9 #include "ash/common/system/system_notifier.h"
10 #include "ash/common/system/tray/system_tray_notifier.h" 10 #include "ash/common/system/tray/system_tray_notifier.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "grit/ash_resources.h" 12 #include "grit/ash_resources.h"
13 #include "grit/ash_strings.h" 13 #include "grit/ash_strings.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/message_center/message_center.h" 16 #include "ui/message_center/message_center.h"
17 #include "ui/message_center/notification.h" 17 #include "ui/message_center/notification.h"
18 18
19 using message_center::Notification; 19 using message_center::Notification;
20 20
21 namespace ash { 21 namespace ash {
22 namespace { 22 namespace {
23 23
24 const char kScreenShareNotificationId[] = "chrome://screen/share"; 24 const char kScreenShareNotificationId[] = "chrome://screen/share";
25 } 25 }
26 26
27 ScreenShareTrayItem::ScreenShareTrayItem(SystemTray* system_tray) 27 ScreenShareTrayItem::ScreenShareTrayItem(SystemTray* system_tray)
28 : ScreenTrayItem(system_tray) { 28 : ScreenTrayItem(system_tray, UMA_SCREEN_SHARE) {
29 WmShell::Get()->system_tray_notifier()->AddScreenShareObserver(this); 29 WmShell::Get()->system_tray_notifier()->AddScreenShareObserver(this);
30 } 30 }
31 31
32 ScreenShareTrayItem::~ScreenShareTrayItem() { 32 ScreenShareTrayItem::~ScreenShareTrayItem() {
33 WmShell::Get()->system_tray_notifier()->RemoveScreenShareObserver(this); 33 WmShell::Get()->system_tray_notifier()->RemoveScreenShareObserver(this);
34 } 34 }
35 35
36 views::View* ScreenShareTrayItem::CreateTrayView(LoginStatus status) { 36 views::View* ScreenShareTrayItem::CreateTrayView(LoginStatus status) {
37 set_tray_view(new tray::ScreenTrayView(this, IDR_AURA_UBER_TRAY_SCREENSHARE)); 37 set_tray_view(new tray::ScreenTrayView(this, IDR_AURA_UBER_TRAY_SCREENSHARE));
38 return tray_view(); 38 return tray_view();
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 } 93 }
94 94
95 void ScreenShareTrayItem::OnScreenShareStop() { 95 void ScreenShareTrayItem::OnScreenShareStop() {
96 // We do not need to run the stop callback 96 // We do not need to run the stop callback
97 // when screening is stopped externally. 97 // when screening is stopped externally.
98 set_is_started(false); 98 set_is_started(false);
99 Update(); 99 Update();
100 } 100 }
101 101
102 } // namespace ash 102 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698