Attemp 2 at:

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 77 matching lines @@
 // buttons, but the space will look cluttered if it actually slides under them,
 // so we stop it when the gap between the two is down to 5 px.
 const int kNewTabCaptionRestoredSpacing = 5;
 // In maximized mode, where the New Tab button and the caption buttons are at
 // similar vertical coordinates, we need to reserve a larger, 16 px gap to avoid
 // looking too cluttered.
 const int kNewTabCaptionMaximizedSpacing = 16;
 // How far to indent the tabstrip from the left side of the screen when there
 // is no OTR icon.
 const int kTabStripIndent = 1;
-// Spacing between extension app icon/title and tab strip.
-const int kExtensionAppTabStripLeftSpacing = 10;
 // Padding between the caption and start of vertical tabs.
 const int kVerticalTabPadding = 6;
 // Inset from the top of the toolbar/tabstrip to the shadow. Used only for
 // vertical tabs.
 const int kVerticalTabBorderInset = 3;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, public:
 
@@ skipping 101 matching lines @@
     tabstrip_y += kNonClientRestoredExtraThickness;
   }
 
   int tabstrip_x = browser_view_->ShouldShowOffTheRecordAvatar() ?
       (otr_avatar_icon_->bounds().right() + kOTRSideSpacing) :
       NonClientBorderThickness() + kTabStripIndent;
 
   int tabstrip_width = minimize_button_->x() - tabstrip_x -
       (frame_->GetWindow()->IsMaximized() ?
       kNewTabCaptionMaximizedSpacing : kNewTabCaptionRestoredSpacing);
-
-  if (browser_view_->browser()->type() == Browser::TYPE_EXTENSION_APP) {
-    int tabstrip_offset = browser_view_->extension_app_title()->x() +
-        browser_view_->extension_app_title()->width() +
-        kExtensionAppTabStripLeftSpacing;
-
-    tabstrip_x += tabstrip_offset;
-    tabstrip_width -= tabstrip_offset;
-  }
-
   return gfx::Rect(tabstrip_x, tabstrip_y,
                    std::max(0, tabstrip_width),
                    tabstrip->GetPreferredHeight());
 }
 
 void OpaqueBrowserFrameView::UpdateThrobber(bool running) {
   if (window_icon_)
     window_icon_->Update();
 }
 
@@ skipping 842 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;
 }