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

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

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 #include "chrome/browser/ui/ash/vpn_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/vpn_delegate_chromeos.h"
6 6
7 #include "ash/common/system/tray/system_tray_delegate.h"
7 #include "ash/shell.h" 8 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/threading/thread_task_runner_handle.h" 12 #include "base/threading/thread_task_runner_handle.h"
13 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/chromeos/profiles/profile_helper.h" 14 #include "chrome/browser/chromeos/profiles/profile_helper.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "components/user_manager/user.h" 16 #include "components/user_manager/user.h"
17 #include "components/user_manager/user_manager.h" 17 #include "components/user_manager/user_manager.h"
18 #include "content/public/browser/notification_service.h" 18 #include "content/public/browser/notification_service.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 } 160 }
161 161
162 void VPNDelegateChromeOS::AttachToPrimaryUserExtensionRegistry() { 162 void VPNDelegateChromeOS::AttachToPrimaryUserExtensionRegistry() {
163 DCHECK(!extension_registry_); 163 DCHECK(!extension_registry_);
164 extension_registry_ = 164 extension_registry_ =
165 extensions::ExtensionRegistry::Get(GetProfileForPrimaryUser()); 165 extensions::ExtensionRegistry::Get(GetProfileForPrimaryUser());
166 extension_registry_->AddObserver(this); 166 extension_registry_->AddObserver(this);
167 167
168 UpdateVPNProviders(); 168 UpdateVPNProviders();
169 } 169 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698