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

Side by Side Diff: chromeos/network/network_device_handler_impl.cc

Issue 919183002: Move chromeos::device_event_log into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Shut down in PostDestroyThreads. Created 5 years, 10 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
« no previous file with comments | « chromeos/login/login_state.cc ('k') | chromeos/network/network_event_log.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chromeos/network/network_device_handler_impl.h" 5 #include "chromeos/network/network_device_handler_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chromeos/dbus/dbus_thread_manager.h" 13 #include "chromeos/dbus/dbus_thread_manager.h"
14 #include "chromeos/dbus/shill_device_client.h" 14 #include "chromeos/dbus/shill_device_client.h"
15 #include "chromeos/dbus/shill_ipconfig_client.h" 15 #include "chromeos/dbus/shill_ipconfig_client.h"
16 #include "chromeos/device_event_log.h"
17 #include "chromeos/network/device_state.h" 16 #include "chromeos/network/device_state.h"
18 #include "chromeos/network/network_handler_callbacks.h" 17 #include "chromeos/network/network_handler_callbacks.h"
19 #include "chromeos/network/network_state_handler.h" 18 #include "chromeos/network/network_state_handler.h"
19 #include "components/device_event_log/device_event_log.h"
20 #include "dbus/object_path.h" 20 #include "dbus/object_path.h"
21 #include "third_party/cros_system_api/dbus/service_constants.h" 21 #include "third_party/cros_system_api/dbus/service_constants.h"
22 22
23 namespace chromeos { 23 namespace chromeos {
24 24
25 namespace { 25 namespace {
26 26
27 std::string GetErrorNameForShillError(const std::string& shill_error_name) { 27 std::string GetErrorNameForShillError(const std::string& shill_error_name) {
28 if (shill_error_name == shill::kErrorResultFailure) 28 if (shill_error_name == shill::kErrorResultFailure)
29 return NetworkDeviceHandler::kErrorFailure; 29 return NetworkDeviceHandler::kErrorFailure;
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 scoped_ptr<base::DictionaryValue> error_data(new base::DictionaryValue); 559 scoped_ptr<base::DictionaryValue> error_data(new base::DictionaryValue);
560 error_data->SetString(network_handler::kErrorName, kErrorDeviceMissing); 560 error_data->SetString(network_handler::kErrorName, kErrorDeviceMissing);
561 error_callback.Run(kErrorDeviceMissing, error_data.Pass()); 561 error_callback.Run(kErrorDeviceMissing, error_data.Pass());
562 return NULL; 562 return NULL;
563 } 563 }
564 564
565 return device_state; 565 return device_state;
566 } 566 }
567 567
568 } // namespace chromeos 568 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/login/login_state.cc ('k') | chromeos/network/network_event_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698