summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/audio/audio_mixer_alsa.cc2
-rw-r--r--chrome/browser/chromeos/boot_times_loader.cc4
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_event_router.cc6
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_notifications.cc21
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_notifications.h11
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc21
-rw-r--r--chrome/browser/chromeos/external_metrics.cc8
-rw-r--r--chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc4
-rw-r--r--chrome/browser/chromeos/net/network_change_notifier_chromeos.cc4
-rw-r--r--chrome/browser/chromeos/web_socket_proxy_controller.cc4
10 files changed, 45 insertions, 40 deletions
diff --git a/chrome/browser/chromeos/audio/audio_mixer_alsa.cc b/chrome/browser/chromeos/audio/audio_mixer_alsa.cc
index 40d1142..c51cca8 100644
--- a/chrome/browser/chromeos/audio/audio_mixer_alsa.cc
+++ b/chrome/browser/chromeos/audio/audio_mixer_alsa.cc
@@ -161,7 +161,7 @@ void AudioMixerAlsa::Connect() {
if (!ConnectInternal()) {
thread_->message_loop()->PostDelayedTask(FROM_HERE,
base::Bind(&AudioMixerAlsa::Connect, base::Unretained(this)),
- kConnectionRetrySleepSec * 1000);
+ base::TimeDelta::FromSeconds(kConnectionRetrySleepSec));
}
}
diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc
index 2f9779f..7df1807 100644
--- a/chrome/browser/chromeos/boot_times_loader.cc
+++ b/chrome/browser/chromeos/boot_times_loader.cc
@@ -234,7 +234,7 @@ void BootTimesLoader::Backend::GetBootTimes(
BrowserThread::FILE,
FROM_HERE,
base::Bind(&Backend::GetBootTimes, this, request),
- kReadAttemptDelayMs);
+ base::TimeDelta::FromMilliseconds(kReadAttemptDelayMs));
return;
}
@@ -366,7 +366,7 @@ void BootTimesLoader::LoginDone() {
BrowserThread::FILE, FROM_HERE,
base::Bind(&WriteTimes, kLoginTimes, kUmaLogin, kUmaLoginPrefix,
login_time_markers_),
- kLoginTimeWriteDelayMs);
+ base::TimeDelta::FromMilliseconds(kLoginTimeWriteDelayMs));
}
void BootTimesLoader::WriteLogoutTimes() {
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index 6ecebdf..ba82050 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -585,7 +585,7 @@ void FileBrowserEventRouter::OnDeviceAdded(
notifications_->RegisterDevice(device_path);
notifications_->ShowNotificationDelayed(FileBrowserNotifications::DEVICE,
device_path,
- 5000);
+ base::TimeDelta::FromSeconds(5));
}
void FileBrowserEventRouter::OnDeviceRemoved(
@@ -630,7 +630,9 @@ void FileBrowserEventRouter::OnFormattingFinished(
device_path);
// Hide it after a couple of seconds.
notifications_->HideNotificationDelayed(
- FileBrowserNotifications::FORMAT_SUCCESS, device_path, 4000);
+ FileBrowserNotifications::FORMAT_SUCCESS,
+ device_path,
+ base::TimeDelta::FromSeconds(4));
// MountPath auto-detects filesystem format if second argument is empty.
// The third argument (mount label) is not used in a disk mount operation.
DiskMountManager::GetInstance()->MountPath(device_path, std::string(),
diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications.cc b/chrome/browser/chromeos/extensions/file_browser_notifications.cc
index d7a5186..946337d 100644
--- a/chrome/browser/chromeos/extensions/file_browser_notifications.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_notifications.cc
@@ -130,15 +130,15 @@ void FileBrowserNotifications::ShowNotificationWithMessage(
}
}
-void FileBrowserNotifications::ShowNotificationDelayed(NotificationType type,
- const std::string& path, size_t delay_ms) {
+void FileBrowserNotifications::ShowNotificationDelayed(
+ NotificationType type, const std::string& path, base::TimeDelta delay) {
std::string notification_id;
CreateNotificationId(type, path, &notification_id);
CreateNotification(notification_id, GetIconId(type), GetTitleId(type));
PostDelayedShowNotificationTask(notification_id, type,
l10n_util::GetStringUTF16(GetMessageId(type)),
- delay_ms);
+ delay);
}
void FileBrowserNotifications::HideNotification(NotificationType type,
@@ -153,19 +153,18 @@ void FileBrowserNotifications::HideNotification(NotificationType type,
}
}
-void FileBrowserNotifications::HideNotificationDelayed(NotificationType type,
- const std::string& path,
- size_t delay_ms) {
- PostDelayedHideNotificationTask(type, path, delay_ms);
+void FileBrowserNotifications::HideNotificationDelayed(
+ NotificationType type, const std::string& path, base::TimeDelta delay) {
+ PostDelayedHideNotificationTask(type, path, delay);
}
void FileBrowserNotifications::PostDelayedShowNotificationTask(
const std::string& notification_id, NotificationType type,
- const string16& message, size_t delay_ms) {
+ const string16& message, base::TimeDelta delay) {
MessageLoop::current()->PostDelayedTask(FROM_HERE,
base::Bind(&ShowNotificationDelayedTask, notification_id, type,
message, AsWeakPtr()),
- delay_ms);
+ delay);
}
// static
@@ -188,10 +187,10 @@ void FileBrowserNotifications::ShowNotificationDelayedTask(
}
void FileBrowserNotifications::PostDelayedHideNotificationTask(
- NotificationType type, const std::string path, size_t delay_ms) {
+ NotificationType type, const std::string path, base::TimeDelta delay) {
MessageLoop::current()->PostDelayedTask(FROM_HERE,
base::Bind(&HideNotificationDelayedTask, type, path, AsWeakPtr()),
- delay_ms);
+ delay);
}
// static
diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications.h b/chrome/browser/chromeos/extensions/file_browser_notifications.h
index 2522f4f..c646581 100644
--- a/chrome/browser/chromeos/extensions/file_browser_notifications.h
+++ b/chrome/browser/chromeos/extensions/file_browser_notifications.h
@@ -52,7 +52,7 @@ class FileBrowserNotifications
void ShowNotification(NotificationType type, const std::string& path);
void ShowNotificationDelayed(NotificationType type,
const std::string& path,
- size_t delay_ms);
+ base::TimeDelta delay);
virtual void ShowNotificationWithMessage(NotificationType type,
const std::string& path,
const string16& message);
@@ -60,7 +60,7 @@ class FileBrowserNotifications
virtual void HideNotification(NotificationType type, const std::string& path);
void HideNotificationDelayed(NotificationType type,
const std::string& path,
- size_t delay_ms);
+ base::TimeDelta delay);
const NotificationMap& notifications() const { return notifications_; }
@@ -69,15 +69,14 @@ class FileBrowserNotifications
const std::string& notification_id,
NotificationType type,
const string16& message,
- size_t delay_ms);
+ base::TimeDelta delay);
static void ShowNotificationDelayedTask(const std::string& notification_id,
NotificationType type,
const string16& message,
base::WeakPtr<FileBrowserNotifications> self);
- virtual void PostDelayedHideNotificationTask(NotificationType type,
- const std::string path,
- size_t delay_ms);
+ virtual void PostDelayedHideNotificationTask(
+ NotificationType type, const std::string path, base::TimeDelta delay);
static void HideNotificationDelayedTask(NotificationType type,
const std::string& path,
base::WeakPtr<FileBrowserNotifications> self);
diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc b/chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc
index bb2f99d..3d6276a 100644
--- a/chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc
@@ -30,7 +30,7 @@ class MockFileBrowserNotifications : public FileBrowserNotifications {
const std::string& notification_id,
NotificationType type,
const string16& message,
- size_t delay_ms) OVERRIDE {
+ base::TimeDelta delay) OVERRIDE {
show_callback_data_.id = notification_id;
show_callback_data_.type = type;
show_callback_data_.message = message;
@@ -39,7 +39,7 @@ class MockFileBrowserNotifications : public FileBrowserNotifications {
// Records the notification so we can force it to hide later.
virtual void PostDelayedHideNotificationTask(NotificationType type,
const std::string path,
- size_t delay_ms) OVERRIDE {
+ base::TimeDelta delay) OVERRIDE {
hide_callback_data_.type = type;
hide_callback_data_.path = path;
}
@@ -168,7 +168,8 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, ShowDelayedTest) {
InitNotifications();
// Adding a delayed notification does not show a balloon.
notifications_->ShowNotificationDelayed(FileBrowserNotifications::DEVICE,
- "path", 3000);
+ "path",
+ base::TimeDelta::FromSeconds(3));
EXPECT_EQ(0u, collection_->GetActiveBalloons().size());
// Forcing the show to happen makes the balloon appear.
@@ -180,7 +181,8 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, ShowDelayedTest) {
// Showing a notification both immediately and delayed results in one
// additional balloon.
notifications_->ShowNotificationDelayed(FileBrowserNotifications::DEVICE_FAIL,
- "path", 3000);
+ "path",
+ base::TimeDelta::FromSeconds(3));
notifications_->ShowNotification(FileBrowserNotifications::DEVICE_FAIL,
"path");
EXPECT_EQ(2u, collection_->GetActiveBalloons().size());
@@ -197,8 +199,9 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, ShowDelayedTest) {
// If we schedule a show for later, then hide before it becomes visible,
// the balloon should not be added.
- notifications_->ShowNotificationDelayed(
- FileBrowserNotifications::FORMAT_FAIL, "path", 3000);
+ notifications_->ShowNotificationDelayed(FileBrowserNotifications::FORMAT_FAIL,
+ "path",
+ base::TimeDelta::FromSeconds(3));
notifications_->HideNotification(FileBrowserNotifications::FORMAT_FAIL,
"path");
EXPECT_EQ(2u, collection_->GetActiveBalloons().size());
@@ -221,7 +224,8 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, HideDelayedTest) {
// Showing now, and scheduling a hide for later, results in one balloon.
notifications_->ShowNotification(FileBrowserNotifications::DEVICE, "path");
notifications_->HideNotificationDelayed(FileBrowserNotifications::DEVICE,
- "path", 3000);
+ "path",
+ base::TimeDelta::FromSeconds(3));
EXPECT_EQ(1u, collection_->GetActiveBalloons().size());
EXPECT_TRUE(FindBalloon("Dpath"));
@@ -240,7 +244,8 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, HideDelayedTest) {
// Delayed hide for a notification that doesn't exist does nothing.
notifications_->HideNotificationDelayed(FileBrowserNotifications::DEVICE_FAIL,
- "path", 3000);
+ "path",
+ base::TimeDelta::FromSeconds(3));
notifications_->ExecuteHide();
ui_test_utils::RunAllPendingInMessageLoop();
EXPECT_EQ(0u, collection_->GetActiveBalloons().size());
diff --git a/chrome/browser/chromeos/external_metrics.cc b/chrome/browser/chromeos/external_metrics.cc
index c3a6188..fbb2eec 100644
--- a/chrome/browser/chromeos/external_metrics.cc
+++ b/chrome/browser/chromeos/external_metrics.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -31,8 +31,8 @@ using content::UserMetricsAction;
namespace chromeos {
-// The interval between external metrics collections, in milliseconds.
-static const int kExternalMetricsCollectionIntervalMs = 30 * 1000;
+// The interval between external metrics collections in seconds
+static const int kExternalMetricsCollectionIntervalSeconds = 30;
ExternalMetrics::ExternalMetrics()
: test_recorder_(NULL) {
@@ -240,7 +240,7 @@ void ExternalMetrics::ScheduleCollector() {
result = BrowserThread::PostDelayedTask(
BrowserThread::FILE, FROM_HERE,
base::Bind(&chromeos::ExternalMetrics::CollectEventsAndReschedule, this),
- kExternalMetricsCollectionIntervalMs);
+ base::TimeDelta::FromSeconds(kExternalMetricsCollectionIntervalSeconds));
DCHECK(result);
}
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc
index f1c3a95..82b17d3 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc
@@ -169,7 +169,7 @@ KioskModeSettings::KioskModeSettings() : is_initialized_(false) {
content::BrowserThread::UI, FROM_HERE,
base::Bind(&KioskModeSettings::VerifyModeIsKnown,
base::Unretained(this)),
- kDeviceModeFetchRetryDelayMs);
+ base::TimeDelta::FromMilliseconds(kDeviceModeFetchRetryDelayMs));
}
}
is_kiosk_mode_ = false;
@@ -190,7 +190,7 @@ void KioskModeSettings::VerifyModeIsKnown() {
content::BrowserThread::UI, FROM_HERE,
base::Bind(&KioskModeSettings::VerifyModeIsKnown,
base::Unretained(this)),
- kDeviceModeFetchRetryDelayMs);
+ base::TimeDelta::FromMilliseconds(kDeviceModeFetchRetryDelayMs));
break;
case policy::DEVICE_MODE_KIOSK:
BrowserList::ExitCleanly();
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
index dd9b2c8..1f93afd 100644
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
+++ b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
@@ -35,7 +35,7 @@ NetworkChangeNotifierChromeos::NetworkChangeNotifierChromeos()
BrowserThread::UI, FROM_HERE,
base::Bind(
&NetworkChangeNotifierChromeos::UpdateInitialState, this),
- kInitialNotificationCheckDelayMS);
+ base::TimeDelta::FromMilliseconds(kInitialNotificationCheckDelayMS));
}
NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
@@ -196,7 +196,7 @@ void NetworkChangeNotifierChromeos::ReportOnlineStateChange(bool is_online) {
base::Bind(
&NetworkChangeNotifierChromeos::ReportOnlineStateChangeOnUIThread,
weak_factory_.GetWeakPtr()),
- kOnlineNotificationDelayMS);
+ base::TimeDelta::FromMilliseconds(kOnlineNotificationDelayMS));
}
void NetworkChangeNotifierChromeos::ReportOnlineStateChangeOnUIThread() {
diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc
index 50d286c..d356ff9 100644
--- a/chrome/browser/chromeos/web_socket_proxy_controller.cc
+++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc
@@ -101,12 +101,12 @@ class ProxyLifetime
MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::Bind(&ProxyLifetime::ProxyCallback, base::Unretained(this)),
- delay_ms_);
+ base::TimeDelta::FromMilliseconds(delay_ms_));
}
}
}
- // Delay between next attempt to run proxy.
+ // Delay in milliseconds between next attempt to run proxy.
int volatile delay_ms_;
// Proxy listens for incoming websocket connections on this port.
generated by cgit v1.1 at 2025-05-08 05:27:24 +0000