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

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

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo 'git cl format' and nullptr changes. Created 4 years, 6 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/system/chromeos/screen_security/screen_share_tray_item.h" 5 #include "ash/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/shell.h" 10 #include "ash/shell.h"
10 #include "ash/system/system_notifier.h"
11 #include "grit/ash_resources.h" 11 #include "grit/ash_resources.h"
12 #include "grit/ash_strings.h" 12 #include "grit/ash_strings.h"
13 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
14 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/message_center/message_center.h" 15 #include "ui/message_center/message_center.h"
16 #include "ui/message_center/notification.h" 16 #include "ui/message_center/notification.h"
17 17
18 using message_center::Notification; 18 using message_center::Notification;
19 19
20 namespace ash { 20 namespace ash {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 } 92 }
93 93
94 void ScreenShareTrayItem::OnScreenShareStop() { 94 void ScreenShareTrayItem::OnScreenShareStop() {
95 // We do not need to run the stop callback 95 // We do not need to run the stop callback
96 // when screening is stopped externally. 96 // when screening is stopped externally.
97 set_is_started(false); 97 set_is_started(false);
98 Update(); 98 Update();
99 } 99 }
100 100
101 } // namespace ash 101 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698