chrome/browser/chromeos/net/network_portal_notification_controller.cc - Issue 2072013002: mash: Move tray settings and deps to common.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/net/network_portal_notification_controller.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 side-by-side diff with in-line comments

Download patch

« ash/common/DEPS ('K') | « chrome/browser/chromeos/hats/hats_notification_controller.cc ('k') | chrome/browser/chromeos/status/data_promo_notification.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/network_portal_notification_controller.cc

diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller.cc b/chrome/browser/chromeos/net/network_portal_notification_controller.cc

index 00801614db88d080eee4860ecd4d94508eabb4b3..f90253f40d5431d45b078427e387eef4ffbca2a2 100644

--- a/chrome/browser/chromeos/net/network_portal_notification_controller.cc

+++ b/chrome/browser/chromeos/net/network_portal_notification_controller.cc

@@ -9,8 +9,8 @@

#include <memory>

#include <vector>

+#include "ash/common/system/system_notifier.h"

#include "ash/shell.h"

-#include "ash/system/system_notifier.h"

#include "ash/system/tray/system_tray_notifier.h"

#include "base/command_line.h"

#include "base/compiler_specific.h"

« ash/common/DEPS ('K') | « chrome/browser/chromeos/hats/hats_notification_controller.cc ('k') | chrome/browser/chromeos/status/data_promo_notification.cc » ('j') | no next file with comments »