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

Side by Side Diff: chrome/browser/chromeos/options/network_connect.cc

Issue 22588002: Refactor the client certificate code in chromeos/network/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chromeos/cert_loader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/options/network_connect.h" 5 #include "chrome/browser/chromeos/options/network_connect.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/system/chromeos/network/network_connect.h" 9 #include "ash/system/chromeos/network/network_connect.h"
10 #include "ash/system/chromeos/network/network_observer.h" 10 #include "ash/system/chromeos/network/network_observer.h"
11 #include "ash/system/tray/system_tray_notifier.h" 11 #include "ash/system/tray/system_tray_notifier.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "chrome/browser/chromeos/enrollment_dialog_view.h" 15 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
16 #include "chrome/browser/chromeos/login/user_manager.h" 16 #include "chrome/browser/chromeos/login/user_manager.h"
17 #include "chrome/browser/chromeos/options/network_config_view.h" 17 #include "chrome/browser/chromeos/options/network_config_view.h"
18 #include "chrome/browser/profiles/profile_manager.h" 18 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/browser/ui/browser_finder.h" 19 #include "chrome/browser/ui/browser_finder.h"
20 #include "chrome/browser/ui/chrome_pages.h" 20 #include "chrome/browser/ui/chrome_pages.h"
21 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" 21 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "chromeos/chromeos_switches.h" 23 #include "chromeos/chromeos_switches.h"
24 #include "chromeos/network/certificate_pattern.h" 24 #include "chromeos/network/certificate_pattern.h"
25 #include "chromeos/network/certificate_pattern_matcher.h"
26 #include "chromeos/network/managed_network_configuration_handler.h" 25 #include "chromeos/network/managed_network_configuration_handler.h"
27 #include "chromeos/network/network_event_log.h" 26 #include "chromeos/network/network_event_log.h"
28 #include "chromeos/network/network_handler.h" 27 #include "chromeos/network/network_handler.h"
29 #include "chromeos/network/network_state.h" 28 #include "chromeos/network/network_state.h"
30 #include "chromeos/network/network_state_handler.h" 29 #include "chromeos/network/network_state_handler.h"
31 #include "content/public/browser/user_metrics.h" 30 #include "content/public/browser/user_metrics.h"
32 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
33 #include "net/base/escape.h" 32 #include "net/base/escape.h"
34 #include "third_party/cros_system_api/dbus/service_constants.h" 33 #include "third_party/cros_system_api/dbus/service_constants.h"
35 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 const NetworkState* network, 156 const NetworkState* network,
158 onc::ONCSource* onc_source) { 157 onc::ONCSource* onc_source) {
159 const User* user = UserManager::Get()->GetActiveUser(); 158 const User* user = UserManager::Get()->GetActiveUser();
160 std::string username_hash = user ? user->username_hash() : std::string(); 159 std::string username_hash = user ? user->username_hash() : std::string();
161 return NetworkHandler::Get()->managed_network_configuration_handler()-> 160 return NetworkHandler::Get()->managed_network_configuration_handler()->
162 FindPolicyByGUID(username_hash, network->guid(), onc_source); 161 FindPolicyByGUID(username_hash, network->guid(), onc_source);
163 } 162 }
164 163
165 } // namespace network_connect 164 } // namespace network_connect
166 } // namespace chromeos 165 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chromeos/cert_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698