diff options
Diffstat (limited to 'chrome/browser/chromeos/cros')
-rw-r--r-- | chrome/browser/chromeos/cros/burn_library.cc | 3 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/cert_library.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/cryptohome_library.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/mock_mount_library.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/mount_library.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 4 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/power_library.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/screen_lock_library.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/cros/update_library.cc | 2 |
9 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/cros/burn_library.cc b/chrome/browser/chromeos/cros/burn_library.cc index cd5bf3f..bc07a95 100644 --- a/chrome/browser/chromeos/cros/burn_library.cc +++ b/chrome/browser/chromeos/cros/burn_library.cc @@ -5,11 +5,12 @@ #include "chrome/browser/chromeos/cros/burn_library.h" #include <cstring> + #include "base/bind.h" #include "base/memory/linked_ptr.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/common/zip.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index 387ad10..4709fe1 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/chrome/browser/chromeos/cros/cert_library.cc @@ -11,7 +11,7 @@ #include "chrome/browser/browser_process.h" // g_browser_process #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/common/net/x509_certificate_model.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "crypto/nss_util.h" #include "grit/generated_resources.h" #include "net/base/cert_database.h" diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc index 718fc1a..955a2e8 100644 --- a/chrome/browser/chromeos/cros/cryptohome_library.cc +++ b/chrome/browser/chromeos/cros/cryptohome_library.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { const char kStubSystemSalt[] = "stub_system_salt"; diff --git a/chrome/browser/chromeos/cros/mock_mount_library.cc b/chrome/browser/chromeos/cros/mock_mount_library.cc index 6ecdb90..c7ac747 100644 --- a/chrome/browser/chromeos/cros/mock_mount_library.cc +++ b/chrome/browser/chromeos/cros/mock_mount_library.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros/mount_library.cc b/chrome/browser/chromeos/cros/mount_library.cc index 1910eae..ee9c170 100644 --- a/chrome/browser/chromeos/cros/mount_library.cc +++ b/chrome/browser/chromeos/cros/mount_library.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" const char* kLibraryNotLoaded = "Cros Library not loaded"; const char* kDeviceNotFound = "Device could not be found"; diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 1f3ca46..d44e050 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -24,8 +24,8 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" #include "base/utf_string_conversion_utils.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/native_network_constants.h" @@ -35,7 +35,7 @@ #include "chrome/browser/chromeos/network_login_observer.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" #include "chrome/common/time_format.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN. #include "grit/generated_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/chromeos/cros/power_library.cc b/chrome/browser/chromeos/cros/power_library.cc index cb675c9..01aeb4b 100644 --- a/chrome/browser/chromeos/cros/power_library.cc +++ b/chrome/browser/chromeos/cros/power_library.cc @@ -14,7 +14,7 @@ #include "base/time.h" #include "base/timer.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/cros/chromeos_power.h" #include "third_party/cros/chromeos_resume.h" diff --git a/chrome/browser/chromeos/cros/screen_lock_library.cc b/chrome/browser/chromeos/cros/screen_lock_library.cc index b31b2cc..96853cb 100644 --- a/chrome/browser/chromeos/cros/screen_lock_library.cc +++ b/chrome/browser/chromeos/cros/screen_lock_library.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/observer_list.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/cros/chromeos_screen_lock.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros/update_library.cc b/chrome/browser/chromeos/cros/update_library.cc index adc291d..bc4ec4c 100644 --- a/chrome/browser/chromeos/cros/update_library.cc +++ b/chrome/browser/chromeos/cros/update_library.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/observer_list.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { |