Add support for localized time strings with two units, eg. "2 hours 17 minutes"

ash/display/resolution_notification_controller.cc

 // Copyright 2013 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.
 
 #include "ash/display/resolution_notification_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
@@ skipping 194 matching lines @@
     return;
   }
 
   base::string16 timeout_message;
   message_center::RichNotificationData data;
   if (change_info_->timeout_count > 0) {
     data.buttons.push_back(message_center::ButtonInfo(
         l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_RESOLUTION_CHANGE_ACCEPT)));
     timeout_message = l10n_util::GetStringFUTF16(
         IDS_ASH_DISPLAY_RESOLUTION_TIMEOUT,
-        ui::TimeFormat::TimeDurationLong(
+        ui::TimeFormat::Simple(
+            ui::TimeFormat::FORMAT_DURATION, ui::TimeFormat::LENGTH_LONG,
             base::TimeDelta::FromSeconds(change_info_->timeout_count)));
   }
   data.buttons.push_back(message_center::ButtonInfo(
         l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_RESOLUTION_CHANGE_REVERT)));
 
   data.should_make_spoken_feedback_for_popup_updates = enable_spoken_feedback;
 
   const base::string16 display_name = base::UTF8ToUTF16(
       Shell::GetInstance()->display_manager()->GetDisplayNameForId(
           change_info_->display_id));
@@ skipping 88 matching lines @@
                               &ResolutionNotificationController::OnTimerTick);
   }
 }
 
 void ResolutionNotificationController::SuppressTimerForTest() {
   g_use_timer = false;
 }
 
 }  // namespace internal
 }  // namespace ash