diff options
author | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 20:43:33 +0000 |
---|---|---|
committer | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 20:43:33 +0000 |
commit | e1acf6f902e50222baf99bfb492ecc38a1604975 (patch) | |
tree | 503d45705b14be7e2f1ed86c71d6064abbf90fbe /chrome/browser/views | |
parent | a2f5993e1ce940e8a8eec900abaeed02e2eee09b (diff) | |
download | chromium_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/browser/views')
-rw-r--r-- | chrome/browser/views/bookmark_editor_view.cc | 1 | ||||
-rw-r--r-- | chrome/browser/views/bookmark_editor_view_unittest.cc | 3 | ||||
-rw-r--r-- | chrome/browser/views/clear_browsing_data.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/constrained_window_impl.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/download_item_view.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/download_tab_view.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/external_protocol_dialog.h | 1 | ||||
-rw-r--r-- | chrome/browser/views/page_info_window.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/shelf_item_dialog.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 1 | ||||
-rw-r--r-- | chrome/browser/views/toolbar_star_toggle.cc | 3 | ||||
-rw-r--r-- | chrome/browser/views/toolbar_star_toggle.h | 2 |
12 files changed, 22 insertions, 5 deletions
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index 0aefa26..8eb7979 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -23,6 +23,7 @@ #include "chromium_strings.h" #include "generated_resources.h" +using base::Time; using views::ColumnSet; using views::GridLayout; using views::Label; diff --git a/chrome/browser/views/bookmark_editor_view_unittest.cc b/chrome/browser/views/bookmark_editor_view_unittest.cc index 767d501..0a5ed68 100644 --- a/chrome/browser/views/bookmark_editor_view_unittest.cc +++ b/chrome/browser/views/bookmark_editor_view_unittest.cc @@ -11,6 +11,9 @@ #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" +using base::Time; +using base::TimeDelta; + // Base class for bookmark editor tests. Creates a BookmarkModel and populates // it with test data. class BookmarkEditorViewTest : public testing::Test { diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index c4c88f4..4a948f8 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -21,6 +21,9 @@ #include "generated_resources.h" +using base::Time; +using base::TimeDelta; + // The combo box is vertically aligned to the 'time-period' label, which makes // the combo box look a little too close to the check box above it when we use // standard layout to separate them. We therefore add a little extra margin to @@ -420,4 +423,3 @@ void ClearBrowsingDataView::OnBrowsingDataRemoverDone() { remover_ = NULL; window()->Close(); } - diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index d74ac05..bdd6d0f 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -38,6 +38,8 @@ #include "chromium_strings.h" #include "generated_resources.h" +using base::TimeDelta; + namespace views { class ClientView; } diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index e42b7e6..bc81238 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -22,6 +22,8 @@ #include "generated_resources.h" +using base::TimeDelta; + // TODO(paulg): These may need to be adjusted when download progress // animation is added, and also possibly to take into account // different screen resolutions. diff --git a/chrome/browser/views/download_tab_view.cc b/chrome/browser/views/download_tab_view.cc index 15b43b6..38ca746 100644 --- a/chrome/browser/views/download_tab_view.cc +++ b/chrome/browser/views/download_tab_view.cc @@ -28,6 +28,9 @@ #include "googleurl/src/gurl.h" #include "generated_resources.h" +using base::Time; +using base::TimeDelta; + // Approximate spacing, in pixels, taken from initial UI mock up screens static const int kVerticalPadding = 5; static const int kHorizontalLinkPadding = 15; @@ -1303,4 +1306,3 @@ void DownloadTabUI::Observe(NotificationType type, break; } } - diff --git a/chrome/browser/views/external_protocol_dialog.h b/chrome/browser/views/external_protocol_dialog.h index 2247765..db23116 100644 --- a/chrome/browser/views/external_protocol_dialog.h +++ b/chrome/browser/views/external_protocol_dialog.h @@ -66,4 +66,3 @@ class ExternalProtocolDialog : public views::DialogDelegate { }; #endif // CHROME_BROWSER_EXTERNAL_PROTOCOL_DIALOG_H__ - diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index dce5640..d724132 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -33,6 +33,8 @@ #include "skia/include/SkColor.h" #include "generated_resources.h" +using base::Time; + const int kVerticalPadding = 10; const int kHorizontalPadding = 10; diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index bb3a056..5ea98a3 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -26,6 +26,8 @@ #include "generated_resources.h" #include "net/base/net_util.h" +using base::Time; +using base::TimeDelta; using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 72f7d28..a1e1e41 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -32,6 +32,7 @@ #undef min #undef max +using base::TimeDelta; using views::DropTargetEvent; static const int kDefaultAnimationDurationMs = 100; diff --git a/chrome/browser/views/toolbar_star_toggle.cc b/chrome/browser/views/toolbar_star_toggle.cc index a44ebac..fe72283 100644 --- a/chrome/browser/views/toolbar_star_toggle.cc +++ b/chrome/browser/views/toolbar_star_toggle.cc @@ -12,6 +12,8 @@ #include "chrome/common/resource_bundle.h" #include "googleurl/src/gurl.h" +using base::TimeTicks; + // The amount of time (in milliseconds) between when the bubble closes and when // pressing on the button again does something. Yes, this is a hackish. I tried // many different options, all to no avail: @@ -88,4 +90,3 @@ void ToolbarStarToggle::InfoBubbleClosing(InfoBubble* info_bubble) { bool ToolbarStarToggle::CloseOnEscape() { return true; } - diff --git a/chrome/browser/views/toolbar_star_toggle.h b/chrome/browser/views/toolbar_star_toggle.h index 5f829cb..9537506 100644 --- a/chrome/browser/views/toolbar_star_toggle.h +++ b/chrome/browser/views/toolbar_star_toggle.h @@ -50,7 +50,7 @@ class ToolbarStarToggle : public views::ToggleButton, BrowserToolbarView* host_; // Time the bubble last closed. - TimeTicks bubble_closed_time_; + base::TimeTicks bubble_closed_time_; // If true NotifyClick does nothing. This is set in OnMousePressed based on // the amount of time between when the bubble clicked and now. |