Chrome OS: Prevent overlapping of title and "x" button for devtools window...

chrome/browser/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2010 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/views/frame/opaque_browser_frame_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/compiler_specific.h"
@@ skipping 939 matching lines @@
   // button to the screen corner to obey Fitts' Law.
   int right_extra_width = is_maximized ?
       (kFrameBorderThickness - kFrameShadowThickness) : 0;
   gfx::Size close_button_size = close_button_->GetPreferredSize();
   close_button_->SetBounds(width() - FrameBorderThickness() -
       right_extra_width - close_button_size.width(), caption_y,
       close_button_size.width() + right_extra_width,
       close_button_size.height());
 
 #if defined(OS_CHROMEOS)
-  minimize_button_->SetVisible(!is_maximized);
-  restore_button_->SetVisible(!is_maximized);
-  maximize_button_->SetVisible(!is_maximized);
+  if (is_maximized) {

[whywhat, 2010/07/29 06:13:44]

Do we ever have is_maximized set to false in Chrome OS?

[Dmitry Polukhin, 2010/07/29 06:28:24]

It looks like no but I can't be 100% sure.

+    minimize_button_->SetVisible(false);
+    restore_button_->SetVisible(false);
+    maximize_button_->SetVisible(false);
 
-  if (browser_view_->browser()->type() == Browser::TYPE_DEVTOOLS)
+    if (browser_view_->browser()->type() == Browser::TYPE_DEVTOOLS) {
+      close_button_->SetVisible(true);
+      minimize_button_->SetBounds(close_button_->bounds().x(), 0, 0, 0);
+    } else {
+      close_button_->SetVisible(false);
+      // Set the bounds of the minimize button so that we don't have to change
+      // other places that rely on the bounds. Put it slightly to the right
+      // of the edge of the view, so that when we remove the spacing it lines
+      // up with the edge.
+      minimize_button_->SetBounds(
+          width() - FrameBorderThickness() + kNewTabCaptionMaximizedSpacing,
+          0, 0, 0);
+    }
+
+    return;
+  } else {
     close_button_->SetVisible(true);

[whywhat, 2010/07/29 06:13:44]

Shoudn't we set the rest buttons visible here too?

[Dmitry Polukhin, 2010/07/29 06:28:24]

No, because visibility for all other buttons will be reset in code below.

-  else
-    close_button_->SetVisible(!is_maximized);
-
-  if (is_maximized) {
-    // Set the bounds of the minimize button so that we don't have to change
-    // other places that rely on the bounds. Put it slightly to the right
-    // of the edge of the view, so that when we remove the spacing it lines
-    // up with the edge.
-    minimize_button_->SetBounds(
-        width() - FrameBorderThickness() + kNewTabCaptionMaximizedSpacing, 0, 0,
-        0);
-    return;
   }
 #endif
 
   // When the window is restored, we show a maximized button; otherwise, we show
   // a restore button.
   bool is_restored = !is_maximized && !frame_->GetWindow()->IsMinimized();
   views::ImageButton* invisible_button = is_restored ?
       restore_button_ : maximize_button_;
   invisible_button->SetVisible(false);
 
@@ skipping 83 matching lines @@
 // static
 gfx::Rect OpaqueBrowserFrameView::GetViewBounds(views::View* src,
                                                 views::View* dst) {
   gfx::Rect bounds(src->bounds());
 
   gfx::Point origin_in_dst(bounds.origin());
   View::ConvertPointToView(src->GetParent(), dst, &origin_in_dst);
   bounds.set_origin(origin_in_dst);
   return bounds;
 }