Makes the min window size include the OTR image and caption buttons on

ash/wm/frame_painter.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 "ash/wm/frame_painter.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 275 matching lines @@
   // the title string to collapse to zero width.
   int title_width = GetTitleOffsetX() +
       size_button_->width() -
       kButtonOverlap +
       close_button_->width();
   if (title_width > min_size.width())
     min_size.set_width(title_width);
   return min_size;
 }
 
+int FramePainter::GetRightInset() const {
+  gfx::Size close_size = close_button_->GetPreferredSize();
+  gfx::Size size_button_size = size_button_->GetPreferredSize();
+  return close_size.width() + kCloseButtonOffsetX + size_button_size.width() -
+      kButtonOverlap;
+}
+
 void FramePainter::PaintHeader(views::NonClientFrameView* view,
                                gfx::Canvas* canvas,
                                HeaderMode header_mode,
                                int theme_frame_id,
                                const gfx::ImageSkia* theme_frame_overlay) {
   if (previous_theme_frame_id_ != 0 &&
       previous_theme_frame_id_ != theme_frame_id) {
     crossfade_animation_.reset(new ui::SlideAnimation(this));
     crossfade_theme_frame_id_ = previous_theme_frame_id_;
     crossfade_opacity_ = previous_opacity_;
@@ skipping 310 matching lines @@
   for (std::set<FramePainter*>::const_iterator it = instances_->begin();
        it != instances_->end();
        ++it) {
     FramePainter* painter = *it;
     if (IsVisibleNormalWindow(painter->window_))
       painter->frame_->non_client_view()->SchedulePaint();
   }
 }
 
 }  // namespace ash