Remove some more OS_CHROMEOS from browser.

chrome/browser/ui/views/page_info_bubble_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/ui/views/page_info_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
@@ skipping 129 matching lines @@
   // Calculate how much space the separators take up (with padding).
   views::Separator separator;
   gfx::Size separator_size = separator.GetPreferredSize();
   gfx::Size separator_plus_padding(0, separator_size.height() +
                                       kPaddingAboveSeparator +
                                       kPaddingBelowSeparator);
   return separator_plus_padding;
 }
 
 double PageInfoBubbleView::GetResizeAnimationCurrentValue() {
-#if defined(OS_CHROMEOS)
-  // We don't run the animation on Chrome OS; see explanation in
-  // OnPageInfoModelChanged().
-  return 1.0;
-#else
   return resize_animation_.GetCurrentValue();
-#endif
 }
 
 double PageInfoBubbleView::HeightAnimationValue() {
   // We use the first half of the animation to get to fully expanded mode.
   // Towards the end, we also animate the section into view, as determined
   // by OpacityAnimationValue().
   return std::min(1.0, 2.0 * GetResizeAnimationCurrentValue());
 }
 
 void PageInfoBubbleView::LayoutSections() {
@@ skipping 102 matching lines @@
   size.set_height(target_height);
   return size;
 }
 
 void PageInfoBubbleView::OnPageInfoModelChanged() {
   // The start height must take into account that when we start animating,
   // a separator plus padding is immediately added before the view is animated
   // into existence.
   animation_start_height_ = bounds().height() + GetSeparatorSize().height();
   LayoutSections();
-#if defined(OS_CHROMEOS)
-  // Animating a window's size doesn't work well in X.  Each resize request gets
-  // rerouted to the window manager, which forwards it on to the X server.
-  // That's okay, but to avoid jank (the window's pixmap will have garbage in it
-  // after being resized), compositing window managers also send
-  // _NET_WM_SYNC_REQUEST messages to clients before resizing to ask for notice
-  // after the window has been repainted at the new size.  Chrome appears to
-  // fall behind in handling the repaints, and the sync request responses
-  // typically don't get sent back to the window manager until the animation is
-  // done, which results in the window being invisible until then:
-  // http://crosbug.com/14993.  Trying to e.g. just animate the first-visit
-  // section's opacity has the same negative effect, so we avoid doing any
-  // animation.
-  // TODO(derat): Remove this once we're not using a toplevel X window for the
-  // bubble.
-  SizeToContents();
-#else
   resize_animation_.SetSlideDuration(kPageInfoSlideDuration);
   resize_animation_.Show();
-#endif
 }
 
 gfx::Rect PageInfoBubbleView::GetAnchorRect() {
   // Compensate for some built-in padding in the icon.
   gfx::Rect anchor(BubbleDelegateView::GetAnchorRect());
   anchor.Inset(0, anchor_view() ? 5 : 0);
   return anchor;
 }
 
 void PageInfoBubbleView::LinkClicked(views::Link* source, int event_flags) {
@@ skipping 168 matching lines @@
                         const GURL& url,
                         const SSLStatus& ssl,
                         bool show_history) {
   PageInfoBubbleView* page_info_bubble =
       new PageInfoBubbleView(anchor_view, profile, url, ssl, show_history);
   views::BubbleDelegateView::CreateBubble(page_info_bubble);
   page_info_bubble->Show();
 }
 
 }