summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 02:12:20 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 02:12:20 +0000
commitbbd8da9f17b6b242274a7413f1a70e0b7fd84143 (patch)
treee561728394e0fd38ab71b90acf24f315456f6c8c /chrome_frame
parentd6c045f13d78f3cffe021dad6e8f44b519179aa8 (diff)
downloadchromium_src-bbd8da9f17b6b242274a7413f1a70e0b7fd84143.zip
chromium_src-bbd8da9f17b6b242274a7413f1a70e0b7fd84143.tar.gz
chromium_src-bbd8da9f17b6b242274a7413f1a70e0b7fd84143.tar.bz2
Use a direct include of time headers in chrome_frame/, chromeos/, cloud_print/, components/.
BUG=254986 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/18054007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/bho.cc2
-rw-r--r--chrome_frame/chrome_frame_automation.h2
-rw-r--r--chrome_frame/infobars/internal/infobar_window.h2
-rw-r--r--chrome_frame/plugin_url_request.h2
-rw-r--r--chrome_frame/ready_mode/internal/registry_ready_mode_state.cc2
-rw-r--r--chrome_frame/ready_mode/internal/registry_ready_mode_state.h2
-rw-r--r--chrome_frame/task_marshaller.h2
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.h4
-rw-r--r--chrome_frame/test/ie_configurator.cc2
-rw-r--r--chrome_frame/test/ie_event_sink.cc2
-rw-r--r--chrome_frame/test/mock_ie_event_sink_actions.h2
-rw-r--r--chrome_frame/test/perf/chrome_frame_perftest.cc2
-rw-r--r--chrome_frame/test/registry_watcher_unittest.cc2
-rw-r--r--chrome_frame/test/reliability/page_load_test.cc2
-rw-r--r--chrome_frame/turndown_prompt/reshow_state.h2
15 files changed, 16 insertions, 16 deletions
diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc
index 5009fdd..cf207b3 100644
--- a/chrome_frame/bho.cc
+++ b/chrome_frame/bho.cc
@@ -11,7 +11,7 @@
#include "base/path_service.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/win/scoped_bstr.h"
#include "chrome_frame/buggy_bho_handling.h"
#include "chrome_frame/crash_reporting/crash_metrics.h"
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index f3c8fa3..e92967a 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -16,7 +16,7 @@
#include "base/memory/scoped_handle.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "chrome/test/automation/automation_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome_frame/chrome_frame_delegate.h"
diff --git a/chrome_frame/infobars/internal/infobar_window.h b/chrome_frame/infobars/internal/infobar_window.h
index 310fee8..540f180 100644
--- a/chrome_frame/infobars/internal/infobar_window.h
+++ b/chrome_frame/infobars/internal/infobar_window.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome_frame/infobars/infobar_content.h"
#include "chrome_frame/infobars/infobar_manager.h"
diff --git a/chrome_frame/plugin_url_request.h b/chrome_frame/plugin_url_request.h
index bd14655..718741b 100644
--- a/chrome_frame/plugin_url_request.h
+++ b/chrome_frame/plugin_url_request.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/memory/ref_counted.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/win/scoped_comptr.h"
#include "chrome_frame/chrome_frame_delegate.h"
#include "chrome_frame/urlmon_upload_data_stream.h"
diff --git a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
index 3832443..4ff419d 100644
--- a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
+++ b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
@@ -10,7 +10,7 @@
#include "base/process_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/win/registry.h"
#include "base/win/scoped_comptr.h"
#include "base/win/scoped_handle.h"
diff --git a/chrome_frame/ready_mode/internal/registry_ready_mode_state.h b/chrome_frame/ready_mode/internal/registry_ready_mode_state.h
index 147cca1..a125b68 100644
--- a/chrome_frame/ready_mode/internal/registry_ready_mode_state.h
+++ b/chrome_frame/ready_mode/internal/registry_ready_mode_state.h
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome_frame/ready_mode/internal/ready_mode_state.h"
// Defines the possible Ready Mode states.
diff --git a/chrome_frame/task_marshaller.h b/chrome_frame/task_marshaller.h
index 44f8b16..fa68f2f 100644
--- a/chrome_frame/task_marshaller.h
+++ b/chrome_frame/task_marshaller.h
@@ -13,7 +13,7 @@
#include "base/pending_task.h"
#include "base/synchronization/lock.h"
#include "base/threading/non_thread_safe.h"
-#include "base/time.h"
+#include "base/time/time.h"
class Task;
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index dbee52c..f0d499f 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -21,8 +21,8 @@
#include "base/process_util.h"
#include "base/run_loop.h"
#include "base/test/test_reg_util_win.h"
-#include "base/time.h"
-#include "base/time.h"
+#include "base/time/time.h"
+#include "base/time/time.h"
#include "base/win/registry.h"
#include "base/win/scoped_comptr.h"
#include "chrome_frame/chrome_tab.h"
diff --git a/chrome_frame/test/ie_configurator.cc b/chrome_frame/test/ie_configurator.cc
index 5b7a7e9..8f30c30 100644
--- a/chrome_frame/test/ie_configurator.cc
+++ b/chrome_frame/test/ie_configurator.cc
@@ -14,7 +14,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/win/registry.h"
#include "chrome_frame/chrome_tab.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc
index 182cd4b..5ac8be9 100644
--- a/chrome_frame/test/ie_event_sink.cc
+++ b/chrome_frame/test/ie_event_sink.cc
@@ -17,7 +17,7 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_timeouts.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_handle.h"
#include "base/win/scoped_variant.h"
diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h
index 5fdbf0f..d952c81 100644
--- a/chrome_frame/test/mock_ie_event_sink_actions.h
+++ b/chrome_frame/test/mock_ie_event_sink_actions.h
@@ -15,7 +15,7 @@
#include "base/strings/string_util.h"
#include "base/test/test_process_killer_win.h"
#include "base/threading/platform_thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/common/chrome_switches.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/test/ie_event_sink.h"
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index 401eae2..6db4e01 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -21,7 +21,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_file_util.h"
#include "base/threading/platform_thread.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/win/event_trace_consumer.h"
#include "base/win/event_trace_controller.h"
#include "base/win/registry.h"
diff --git a/chrome_frame/test/registry_watcher_unittest.cc b/chrome_frame/test/registry_watcher_unittest.cc
index 3476510..c02c749 100644
--- a/chrome_frame/test/registry_watcher_unittest.cc
+++ b/chrome_frame/test/registry_watcher_unittest.cc
@@ -5,7 +5,7 @@
#include "chrome_frame/registry_watcher.h"
#include "base/synchronization/waitable_event.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/win/registry.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index 7b7d628..147859b 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -37,7 +37,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_file_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prefs/pref_service_mock_builder.h"
#include "chrome/common/automation_messages.h"
diff --git a/chrome_frame/turndown_prompt/reshow_state.h b/chrome_frame/turndown_prompt/reshow_state.h
index df62125..a3989a1 100644
--- a/chrome_frame/turndown_prompt/reshow_state.h
+++ b/chrome_frame/turndown_prompt/reshow_state.h
@@ -5,7 +5,7 @@
#ifndef CHROME_FRAME_TURNDOWN_PROMPT_RESHOW_STATE_H_
#define CHROME_FRAME_TURNDOWN_PROMPT_RESHOW_STATE_H_
-#include "base/time.h"
+#include "base/time/time.h"
namespace turndown_prompt {