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

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

Issue 2522613004: Revert of chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: 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
« no previous file with comments | « chrome/browser/ui/ash/system_tray_client.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/system_tray_client.cc
diff --git a/chrome/browser/ui/ash/system_tray_client.cc b/chrome/browser/ui/ash/system_tray_client.cc
index cfcb366b693ac17ea1f532be1b21dbb305d62390..66355002167730cfcdf916842db38693dab74f1d 100644
--- a/chrome/browser/ui/ash/system_tray_client.cc
+++ b/chrome/browser/ui/ash/system_tray_client.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
#include "chrome/browser/chromeos/login/ui/login_display_host.h"
#include "chrome/browser/chromeos/options/network_config_view.h"
-#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/set_time_dialog.h"
#include "chrome/browser/chromeos/system/system_clock.h"
#include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
@@ -31,12 +30,9 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/session_manager_client.h"
#include "chromeos/login/login_state.h"
-#include "components/user_manager/user_manager.h"
#include "content/public/browser/user_metrics.h"
#include "content/public/common/service_manager_connection.h"
#include "content/public/common/service_names.mojom.h"
-#include "extensions/browser/api/vpn_provider/vpn_service.h"
-#include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
#include "net/base/escape.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/property_type_converters.h"
@@ -258,23 +254,6 @@
chromeos::NetworkConfigView::ShowForType(type, nullptr /* parent */);
}
-void SystemTrayClient::ShowThirdPartyVpnCreate(
- const std::string& extension_id) {
- const user_manager::User* primary_user =
- user_manager::UserManager::Get()->GetPrimaryUser();
- if (!primary_user)
- return;
-
- Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
- if (!profile)
- return;
-
- // Request that the third-party VPN provider show its "add network" dialog.
- chromeos::VpnServiceFactory::GetForBrowserContext(profile)
- ->SendShowAddDialogToExtension(extension_id);
-}
-
void SystemTrayClient::ShowNetworkSettings(const std::string& network_id) {
if (!chrome::IsRunningInMash()) {
// TODO(mash): Need replacement for SessionStateDelegate. crbug.com/648964
« no previous file with comments | « chrome/browser/ui/ash/system_tray_client.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698