Added BGRA support to qcms.

chrome/browser/chromeos/ui/idle_logout_dialog_view.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/ui/idle_logout_dialog_view.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/time.h"
 #include "base/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Global singleton instance of our dialog class.
 chromeos::IdleLogoutDialogView* g_instance = NULL;
 
-const int kIdleLogoutDialogMaxWidth = 300;
+const int kIdleLogoutDialogMaxWidth = 400;
 const int kCountdownUpdateIntervalMs = 1000;
 
 }  // namespace
 
 namespace chromeos {
 
 IdleLogoutSettingsProvider* IdleLogoutDialogView::provider_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // IdleLogoutSettingsProvider public methods
@@ skipping 51 matching lines @@
 }
 
 views::View* IdleLogoutDialogView::GetContentsView() {
   return this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // IdleLogoutDialog private methods
 IdleLogoutDialogView::IdleLogoutDialogView()
     : restart_label_(NULL),
+      warning_label_(NULL),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   if (!IdleLogoutDialogView::provider_)
     IdleLogoutDialogView::provider_ = new IdleLogoutSettingsProvider();
 }
 
 IdleLogoutDialogView::~IdleLogoutDialogView() {
   if (this == g_instance)
     g_instance = NULL;
 }
 
 void IdleLogoutDialogView::InitAndShow() {
   KioskModeSettings* settings =
       IdleLogoutDialogView::provider_->GetKioskModeSettings();
   if (!settings->is_initialized()) {
     settings->Initialize(base::Bind(&IdleLogoutDialogView::InitAndShow,
                                     weak_ptr_factory_.GetWeakPtr()));
     return;
   }
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
+  warning_label_ = new views::Label(
+      l10n_util::GetStringUTF16(IDS_IDLE_LOGOUT_WARNING));
+  warning_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  warning_label_->SetMultiLine(true);
+  warning_label_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
+  warning_label_->SizeToFit(kIdleLogoutDialogMaxWidth);
+
   restart_label_ = new views::Label();
   restart_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  restart_label_->SetMultiLine(true);
-  restart_label_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
+  restart_label_->SetFont(rb.GetFont(ui::ResourceBundle::BoldFont));
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   views::ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
-                        views::GridLayout::FIXED, kIdleLogoutDialogMaxWidth, 0);
+                        views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 0);
-  layout->AddPaddingRow(0, views::kRelatedControlHorizontalSpacing);
+  layout->AddView(warning_label_);
+  layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
   layout->StartRow(0, 0);
   layout->AddView(restart_label_);
-  layout->AddPaddingRow(0, views::kRelatedControlHorizontalSpacing);
 
-  // We're initialized, show the dialog.
+  // We're initialized, can safely show the dialog now.
   Show();
 }
 
 void IdleLogoutDialogView::Show() {
   KioskModeSettings* settings =
         IdleLogoutDialogView::provider_->GetKioskModeSettings();
 
   // Setup the countdown label before showing.
   countdown_end_time_ = base::Time::Now() +
       settings->GetIdleLogoutWarningDuration();
@@ skipping 59 matching lines @@
   return g_instance;
 }
 
 // static
 void IdleLogoutDialogView::set_settings_provider(
     IdleLogoutSettingsProvider* provider) {
   provider_ = provider;
 }
 
 }  // namespace chromeos