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

Side by Side Diff: chrome/browser/chromeos/cros/network_library_impl_base.cc

Issue 10684002: Move NetworkLoginObserver observer management to NetworkLibraryImplBase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/network_login_observer.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/cros/network_library_impl_base.h" 5 #include "chrome/browser/chromeos/cros/network_library_impl_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/browser/chromeos/cros/native_network_parser.h" 8 #include "chrome/browser/chromeos/cros/native_network_parser.h"
9 #include "chrome/browser/chromeos/cros/onc_network_parser.h" 9 #include "chrome/browser/chromeos/cros/onc_network_parser.h"
10 #include "chrome/browser/chromeos/network_login_observer.h" 10 #include "chrome/browser/chromeos/network_login_observer.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 active_virtual_(NULL), 55 active_virtual_(NULL),
56 available_devices_(0), 56 available_devices_(0),
57 enabled_devices_(0), 57 enabled_devices_(0),
58 busy_devices_(0), 58 busy_devices_(0),
59 connected_devices_(0), 59 connected_devices_(0),
60 wifi_scanning_(false), 60 wifi_scanning_(false),
61 offline_mode_(false), 61 offline_mode_(false),
62 is_locked_(false), 62 is_locked_(false),
63 sim_operation_(SIM_OPERATION_NONE), 63 sim_operation_(SIM_OPERATION_NONE),
64 ALLOW_THIS_IN_INITIALIZER_LIST(notify_manager_weak_factory_(this)) { 64 ALLOW_THIS_IN_INITIALIZER_LIST(notify_manager_weak_factory_(this)) {
65 network_login_observer_.reset(new NetworkLoginObserver(this)); 65 network_login_observer_.reset(new NetworkLoginObserver());
66 AddNetworkManagerObserver(network_login_observer_.get());
66 } 67 }
67 68
68 NetworkLibraryImplBase::~NetworkLibraryImplBase() { 69 NetworkLibraryImplBase::~NetworkLibraryImplBase() {
69 network_manager_observers_.Clear(); 70 network_manager_observers_.Clear();
70 data_plan_observers_.Clear(); 71 data_plan_observers_.Clear();
71 pin_operation_observers_.Clear(); 72 pin_operation_observers_.Clear();
72 user_action_observers_.Clear(); 73 user_action_observers_.Clear();
73 DeleteNetworks(); 74 DeleteNetworks();
74 DeleteRememberedNetworks(); 75 DeleteRememberedNetworks();
75 STLDeleteValues(&data_plan_map_); 76 STLDeleteValues(&data_plan_map_);
(...skipping 1740 matching lines...) Expand 10 before | Expand all | Expand 10 after
1816 GetTpmInfo(); 1817 GetTpmInfo();
1817 return tpm_slot_; 1818 return tpm_slot_;
1818 } 1819 }
1819 1820
1820 const std::string& NetworkLibraryImplBase::GetTpmPin() { 1821 const std::string& NetworkLibraryImplBase::GetTpmPin() {
1821 GetTpmInfo(); 1822 GetTpmInfo();
1822 return tpm_pin_; 1823 return tpm_pin_;
1823 } 1824 }
1824 1825
1825 } // namespace chromeos 1826 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/network_login_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698