Add option to delete browsing history of the last hour.

BUG=35302
TEST=manually test

Review URL: http://codereview.chromium.org/596047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38721 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 44 insertions, 13 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index d079ddd..0560cc9 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3655,6 +3655,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLASH_STORAGE_SETTINGS" desc="Link for opening Adobe Flash Player storage settings">
         Adobe Flash Player storage settings...
       </message>
+      <message name="IDS_CLEAR_DATA_HOUR" desc="deletion period combo box: hour">
+        Last hour
+      </message>
       <message name="IDS_CLEAR_DATA_DAY" desc="deletion period combo box: day">
         Last day
       </message>
diff --git a/chrome/app/nibs/ClearBrowsingData.xib b/chrome/app/nibs/ClearBrowsingData.xib
index 3497631..9654f79 100644
--- a/chrome/app/nibs/ClearBrowsingData.xib
+++ b/chrome/app/nibs/ClearBrowsingData.xib
@@ -2,12 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9L30</string>
+		<string key="IBDocument.SystemVersion">9L31a</string>
 		<string key="IBDocument.InterfaceBuilderVersion">677</string>
 		<string key="IBDocument.AppKitVersion">949.54</string>
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="22"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -43,7 +44,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<object class="NSView" key="NSWindowView" id="1006">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">292</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -70,7 +71,7 @@
 								<int key="NSPeriodicInterval">75</int>
 								<object class="NSMenuItem" key="NSMenuItem" id="1043594244">
 									<reference key="NSMenu" ref="212748305"/>
-									<string key="NSTitle">^IDS_CLEAR_DATA_DAY</string>
+									<string key="NSTitle">^IDS_CLEAR_DATA_HOUR</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -92,6 +93,17 @@
 									<object class="NSMutableArray" key="NSMenuItems">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<reference ref="1043594244"/>
+										<object class="NSMenuItem" id="438778627">
+											<reference key="NSMenu" ref="212748305"/>
+											<string key="NSTitle">^IDS_CLEAR_DATA_DAY</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="445490828"/>
+											<reference key="NSMixedImage" ref="175775312"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="744820906"/>
+										</object>
 										<object class="NSMenuItem" id="130294077">
 											<reference key="NSMenu" ref="212748305"/>
 											<string key="NSTitle">^IDS_CLEAR_DATA_WEEK</string>
@@ -409,6 +421,7 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{331, 299}</string>
+					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -911,6 +924,7 @@
 							<reference ref="130294077"/>
 							<reference ref="723360047"/>
 							<reference ref="445409450"/>
+							<reference ref="438778627"/>
 						</object>
 						<reference key="parent" ref="744820906"/>
 					</object>
@@ -1136,6 +1150,11 @@
 						<reference key="object" ref="817836045"/>
 						<reference key="parent" ref="340114853"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">114</int>
+						<reference key="object" ref="438778627"/>
+						<reference key="parent" ref="212748305"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1152,6 +1171,7 @@
 					<string>1.WindowOrigin</string>
 					<string>1.editorWindowContentRectSynchronizationRect</string>
 					<string>11.IBPluginDependency</string>
+					<string>114.IBPluginDependency</string>
 					<string>12.IBPluginDependency</string>
 					<string>13.IBPluginDependency</string>
 					<string>14.IBPluginDependency</string>
@@ -1189,9 +1209,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{567, 420}, {331, 299}}</string>
+					<string>{{432, 414}, {331, 299}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{567, 420}, {331, 299}}</string>
+					<string>{{432, 414}, {331, 299}}</string>
 					<reference ref="6"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
@@ -1204,7 +1224,8 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{725, 419}, {289, 83}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{610, 393}, {289, 103}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1249,7 +1270,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">113</int>
+			<int key="maxID">114</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 312297f..a350ae5 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -199,6 +199,9 @@ base::Time BrowsingDataRemover::CalculateBeginDeleteTime(
   base::TimeDelta diff;
   base::Time delete_begin_time = base::Time::Now();
   switch (time_period) {
+    case LAST_HOUR:
+      diff = base::TimeDelta::FromHours(1);
+      break;
     case LAST_DAY:
       diff = base::TimeDelta::FromHours(24);
       break;
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h
index 1a9d5fa..74ba60e 100644
--- a/chrome/browser/browsing_data_remover.h
+++ b/chrome/browser/browsing_data_remover.h
@@ -22,7 +22,8 @@ class BrowsingDataRemover : public NotificationObserver {
  public:
   // Time period ranges available when doing browsing data removals.
   enum TimePeriod {
-    LAST_DAY = 0,
+    LAST_HOUR = 0,
+    LAST_DAY,
     LAST_WEEK,
     FOUR_WEEKS,
     EVERYTHING
diff --git a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
index 5eb75a1..f972ae5 100644
--- a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
+++ b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
@@ -114,6 +114,8 @@ ClearBrowsingDataDialogGtk::ClearBrowsingDataDialogGtk(GtkWindow* parent,
   // Time period combo box items.
   time_period_combobox_ = gtk_combo_box_new_text();
   gtk_combo_box_append_text(GTK_COMBO_BOX(time_period_combobox_),
+      l10n_util::GetStringUTF8(IDS_CLEAR_DATA_HOUR).c_str());
+  gtk_combo_box_append_text(GTK_COMBO_BOX(time_period_combobox_),
       l10n_util::GetStringUTF8(IDS_CLEAR_DATA_DAY).c_str());
   gtk_combo_box_append_text(GTK_COMBO_BOX(time_period_combobox_),
       l10n_util::GetStringUTF8(IDS_CLEAR_DATA_WEEK).c_str());
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 8625553..c515656 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -329,15 +329,16 @@ views::ClientView* ClearBrowsingDataView::CreateClientView(
 // ClearBrowsingDataView, ComboboxModel implementation:
 
 int ClearBrowsingDataView::GetItemCount() {
-  return 4;
+  return 5;
 }
 
 std::wstring ClearBrowsingDataView::GetItemAt(int index) {
   switch (index) {
-    case 0: return l10n_util::GetString(IDS_CLEAR_DATA_DAY);
-    case 1: return l10n_util::GetString(IDS_CLEAR_DATA_WEEK);
-    case 2: return l10n_util::GetString(IDS_CLEAR_DATA_4WEEKS);
-    case 3: return l10n_util::GetString(IDS_CLEAR_DATA_EVERYTHING);
+    case 0: return l10n_util::GetString(IDS_CLEAR_DATA_HOUR);
+    case 1: return l10n_util::GetString(IDS_CLEAR_DATA_DAY);
+    case 2: return l10n_util::GetString(IDS_CLEAR_DATA_WEEK);
+    case 3: return l10n_util::GetString(IDS_CLEAR_DATA_4WEEKS);
+    case 4: return l10n_util::GetString(IDS_CLEAR_DATA_EVERYTHING);
     default: NOTREACHED() << L"Missing item";
              return L"?";
   }