Add a border to views_examples' text styles example.

ui/views/examples/text_example.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 "ui/views/examples/text_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/checkbox.h"
@@ skipping 82 matching lines @@
     : font_(ResourceBundle::GetSharedInstance().GetFont(
           ResourceBundle::BaseFont)),
       text_(ASCIIToUTF16(kShortText)),
       text_flags_(0),
       halo_(false),
       fade_(false),
       fade_mode_(gfx::Canvas::TruncateFadeTail) {
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+    View::OnPaint(canvas);
+
+    const gfx::Rect bounds = GetContentsBounds();
+
 #if defined(OS_WIN)
     if (fade_) {
       size_t characters_to_truncate_from_head =
           gfx::Canvas::TruncateFadeHeadAndTail ? 10 : 0;
       canvas->DrawFadeTruncatingString(text_, fade_mode_,
-          characters_to_truncate_from_head, font_, SK_ColorDKGRAY,
-          GetLocalBounds());
+          characters_to_truncate_from_head, font_, SK_ColorDKGRAY, bounds);
       return;
     }
 #endif
 
     if (halo_) {
-      canvas->DrawStringWithHalo(text_, font_, SK_ColorDKGRAY, SK_ColorWHITE, 0,
-          0, width(), height(), text_flags_);
+      canvas->DrawStringWithHalo(text_, font_, SK_ColorDKGRAY, SK_ColorWHITE,
+          bounds.x(), bounds.y(), bounds.width(), bounds.height(), text_flags_);
     } else {
-      canvas->DrawStringInt(text_, font_, SK_ColorDKGRAY, 0, 0, width(),
-          height(), text_flags_);
+      canvas->DrawStringInt(text_, font_, SK_ColorDKGRAY, bounds.x(),
+          bounds.y(), bounds.width(), bounds.height(), text_flags_);
     }
   }
 
   int text_flags() const { return text_flags_; }
   void set_text_flags(int text_flags) { text_flags_ = text_flags; }
 
   const string16& text() const { return text_; }
   void set_text(const string16& text) { text_ = text; }
 
   bool halo() const { return halo_; }
@@ skipping 61 matching lines @@
   example_combobox_model_.push_back(new_model);
   Combobox* combo_box = new Combobox(new_model);
   combo_box->SetSelectedItem(0);
   combo_box->set_listener(this);
   layout->AddView(combo_box, kNumColumns - 1, 1);
   return combo_box;
 }
 
 void TextExample::CreateExampleView(View* container) {
   text_view_ = new TextExampleView;
+  text_view_->set_border(views::Border::CreateSolidBorder(1, SK_ColorGRAY));
 
   GridLayout* layout = new GridLayout(container);
   container->SetLayoutManager(layout);
 
   layout->AddPaddingRow(0, 8);
 
   ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddPaddingColumn(0, 8);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
                         0.1f, GridLayout::USE_PREF, 0, 0);
@@ skipping 152 matching lines @@
         text_flags |= gfx::Canvas::HIDE_PREFIX;
         break;
     }
   }
   text_view_->set_text_flags(text_flags);
   text_view_->SchedulePaint();
 }
 
 }  // namespace examples
 }  // namespace views