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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2513673004: Reland: chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: fix manifest for reland Created 4 years, 1 month 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
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 10d7a7f22ed3a50c7def9fcd640bff0bacb9bdc1..d07ce2fa923a24906645d66ff2193cbaebc095d7 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -59,7 +59,6 @@
#include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h"
#include "chrome/browser/ui/ash/system_tray_client.h"
#include "chrome/browser/ui/ash/system_tray_delegate_utils.h"
-#include "chrome/browser/ui/ash/vpn_delegate_chromeos.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/chrome_pages.h"
@@ -145,7 +144,6 @@ bool IsSessionInSecondaryLoginScreen() {
SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
: cast_config_delegate_(base::MakeUnique<CastConfigDelegateMediaRouter>()),
networking_config_delegate_(new NetworkingConfigDelegateChromeos()),
- vpn_delegate_(new VPNDelegateChromeOS),
weak_ptr_factory_(this) {
// Register notifications on construction so that events such as
// PROFILE_CREATED do not get missed if they happen before Initialize().
@@ -590,10 +588,6 @@ void SystemTrayDelegateChromeOS::RemoveCustodianInfoTrayObserver(
custodian_info_changed_observers_.RemoveObserver(observer);
}
-ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const {
- return vpn_delegate_.get();
-}
-
std::unique_ptr<ash::SystemTrayItem>
SystemTrayDelegateChromeOS::CreateRotationLockTrayItem(ash::SystemTray* tray) {
return base::MakeUnique<ash::TrayRotationLock>(tray);
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/ash/vpn_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698