summaryrefslogtreecommitdiffstats
path: root/chrome/views
diff options
context:
space:
mode:
authordsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-27 20:43:33 +0000
committerdsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-27 20:43:33 +0000
commite1acf6f902e50222baf99bfb492ecc38a1604975 (patch)
tree503d45705b14be7e2f1ed86c71d6064abbf90fbe /chrome/views
parenta2f5993e1ce940e8a8eec900abaeed02e2eee09b (diff)
downloadchromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.zip
chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.tar.gz
chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.tar.bz2
Move Time, TimeDelta and TimeTicks into namespace base.
Review URL: http://codereview.chromium.org/7995 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
-rw-r--r--chrome/views/chrome_menu.cc4
-rw-r--r--chrome/views/menu_button.cc3
-rw-r--r--chrome/views/menu_button.h2
-rw-r--r--chrome/views/repeat_controller.cc2
-rw-r--r--chrome/views/throbber.cc2
5 files changed, 11 insertions, 2 deletions
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index 393afe0..b2870ee 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -28,6 +28,9 @@
#undef min
#undef max
+using base::Time;
+using base::TimeDelta;
+
// Margins between the top of the item and the label.
static const int kItemTopMargin = 3;
@@ -2720,4 +2723,3 @@ void MenuController::StopScrolling() {
}
} // namespace views
-
diff --git a/chrome/views/menu_button.cc b/chrome/views/menu_button.cc
index 412d8fa..e9205b1 100644
--- a/chrome/views/menu_button.cc
+++ b/chrome/views/menu_button.cc
@@ -21,6 +21,9 @@
#include "generated_resources.h"
+using base::Time;
+using base::TimeDelta;
+
namespace views {
// The amount of time, in milliseconds, we wait before allowing another mouse
diff --git a/chrome/views/menu_button.h b/chrome/views/menu_button.h
index de6f973..c43d6b6 100644
--- a/chrome/views/menu_button.h
+++ b/chrome/views/menu_button.h
@@ -81,7 +81,7 @@ class MenuButton : public TextButton {
// menu. There is no clean way to get the second click event because the
// menu is displayed using a modal loop and, unlike regular menus in Windows,
// the button is not part of the displayed menu.
- Time menu_closed_time_;
+ base::Time menu_closed_time_;
// The associated menu's resource identifier.
ViewMenuDelegate* menu_delegate_;
diff --git a/chrome/views/repeat_controller.cc b/chrome/views/repeat_controller.cc
index d6a9ac4..2d52783 100644
--- a/chrome/views/repeat_controller.cc
+++ b/chrome/views/repeat_controller.cc
@@ -4,6 +4,8 @@
#include "chrome/views/repeat_controller.h"
+using base::TimeDelta;
+
namespace views {
// The delay before the first and then subsequent repeats. Values taken from
diff --git a/chrome/views/throbber.cc b/chrome/views/throbber.cc
index 7a82277..ba8695c 100644
--- a/chrome/views/throbber.cc
+++ b/chrome/views/throbber.cc
@@ -10,6 +10,8 @@
#include "chrome/common/resource_bundle.h"
#include "skia/include/SkBitmap.h"
+using base::TimeDelta;
+
namespace views {
Throbber::Throbber(int frame_time_ms,