Applied review comments from oshima for CL 7850026.

chrome/browser/chromeos/frame/panel_browser_view.cc

 // Copyright (c) 2011 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/frame/panel_browser_view.h"
 
 #include "chrome/browser/chromeos/frame/browser_view.h"
 #include "chrome/browser/chromeos/frame/panel_controller.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "views/widget/widget.h"
@@ skipping 15 matching lines @@
     : BrowserView(browser),
       creator_xid_(0) {
 }
 
 PanelBrowserView::~PanelBrowserView() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // PanelBrowserView functions
 
 void PanelBrowserView::LimitBounds(gfx::Rect* bounds) const {
-#if defined(USE_AURA)
-  // TODO(saintlou): Need PureViews panels?
-  bounds->set_width(kPanelDefaultWidthPixels);
-  bounds->set_height(kPanelDefaultHeightPixels);
-#else
   GdkScreen* screen = gtk_widget_get_screen(GetWidget()->GetNativeView());

[oshima, 2011/09/19 22:31:03]

What I meant was that you could comment out the entire method body.

[Emmanuel Saint-loubert-Bié, 2011/09/19 23:26:02]

Done.

   int max_width = gdk_screen_get_width(screen) * kPanelMaxWidthFactor;
   int max_height = gdk_screen_get_height(screen) * kPanelMaxHeightFactor;
 
   if (bounds->width() == 0 && bounds->height() == 0) {
     bounds->set_width(kPanelDefaultWidthPixels);
     bounds->set_height(kPanelDefaultHeightPixels);
   }
 
   if (bounds->width() < kPanelMinWidthPixels)
     bounds->set_width(kPanelMinWidthPixels);
   else if (bounds->width() > max_width)
     bounds->set_width(max_width);
 
   if (bounds->height() < kPanelMinHeightPixels)
     bounds->set_height(kPanelMinHeightPixels);
   else if (bounds->height() > max_height)
     bounds->set_height(max_height);
-#endif
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserView overrides.
 
 void PanelBrowserView::Show() {
   InitPanelController(true);  // focus when opened
   ::BrowserView::Show();
 }
@@ skipping 30 matching lines @@
 }
 
 void PanelBrowserView::UpdateTitleBar() {
   ::BrowserView::UpdateTitleBar();
   if (panel_controller_.get())
     panel_controller_->UpdateTitleBar();
 }
 
 void PanelBrowserView::SetCreatorView(PanelBrowserView* creator) {
   DCHECK(creator);
-#if defined(USE_AURA)
-  // TODO(saintlou): Need PureViews
-#else

[oshima, 2011/09/19 22:31:03]

keep this.

[Emmanuel Saint-loubert-Bié, 2011/09/19 23:26:02]

Done.

   GtkWindow* window = creator->GetNativeHandle();
   creator_xid_ = ui::GetX11WindowFromGtkWidget(GTK_WIDGET(window));
-#endif
 }
 
 WindowOpenDisposition PanelBrowserView::GetDispositionForPopupBounds(
     const gfx::Rect& bounds) {
   return chromeos::BrowserView::DispositionForPopupBounds(bounds);
 }
 
 bool PanelBrowserView::GetSavedWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
@@ skipping 47 matching lines @@
 
 void PanelBrowserView::ClosePanel() {
   Close();
 }
 
 void PanelBrowserView::ActivatePanel() {
   Activate();
 }
 
 }  // namespace chromeos