chrome/browser/ui/ash/vpn_delegate_chromeos.h - Issue 2109293002: mash: Convert system tray network item to wm common types

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/ash/vpn_delegate_chromeos.h

Issue 2109293002: mash: Convert system tray network item to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tweak string 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

« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 #ifndef CHROME_BROWSER_UI_ASH_VPN_DELEGATE_CHROMEOS_H_	5 #ifndef CHROME_BROWSER_UI_ASH_VPN_DELEGATE_CHROMEOS_H_

6 #define CHROME_BROWSER_UI_ASH_VPN_DELEGATE_CHROMEOS_H_	6 #define CHROME_BROWSER_UI_ASH_VPN_DELEGATE_CHROMEOS_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "ash/system/chromeos/network/vpn_delegate.h"	10 #include "ash/common/system/chromeos/network/vpn_delegate.h"

11 #include "base/macros.h"	11 #include "base/macros.h"

12 #include "base/memory/weak_ptr.h"	12 #include "base/memory/weak_ptr.h"

13 #include "content/public/browser/notification_observer.h"	13 #include "content/public/browser/notification_observer.h"

14 #include "content/public/browser/notification_registrar.h"	14 #include "content/public/browser/notification_registrar.h"

15 #include "extensions/browser/extension_registry_observer.h"	15 #include "extensions/browser/extension_registry_observer.h"

16	16

17 namespace extensions {	17 namespace extensions {

18 class ExtensionRegistry;	18 class ExtensionRegistry;

19 }	19 }

20	20

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 std::vector<ash::VPNProvider> vpn_providers_;	65 std::vector<ash::VPNProvider> vpn_providers_;

66	66

67 content::NotificationRegistrar registrar_;	67 content::NotificationRegistrar registrar_;

68	68

69 base::WeakPtrFactory<VPNDelegateChromeOS> weak_factory_;	69 base::WeakPtrFactory<VPNDelegateChromeOS> weak_factory_;

70	70

71 DISALLOW_COPY_AND_ASSIGN(VPNDelegateChromeOS);	71 DISALLOW_COPY_AND_ASSIGN(VPNDelegateChromeOS);

72 };	72 };

73	73

74 #endif // CHROME_BROWSER_UI_ASH_VPN_DELEGATE_CHROMEOS_H_	74 #endif // CHROME_BROWSER_UI_ASH_VPN_DELEGATE_CHROMEOS_H_

OLD	NEW