Remove unreleased web app frame code from ChromeOS

chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc

 // Copyright 2015 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/frame/browser_non_client_frame_view_mus.h"
 
 #include <algorithm>
 
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_frame_mus.h"
 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
-#include "chrome/browser/ui/views/frame/web_app_left_header_view_ash.h"
 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "services/ui/public/cpp/window.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
@@ skipping 230 matching lines @@
 
   // TODO(sky): get immersive mode working.
 
   if (UseImmersiveLightbarHeaderStyle()) {
     PaintImmersiveLightbarStyleHeader(canvas);
     return;
   }
 
   if (browser_view()->IsToolbarVisible())
     PaintToolbarBackground(canvas);
-  else if (!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle())
+  else if (!UsePackagedAppHeaderStyle())
     PaintContentEdge(canvas);
 }
 
 void BrowserNonClientFrameViewMus::Layout() {
   if (profile_indicator_icon())
     LayoutIncognitoButton();
 
 #if defined(FRAME_AVATAR_BUTTON)
   if (profile_switcher_.view())
     LayoutProfileSwitcher();
@@ skipping 120 matching lines @@
          !immersive_controller->IsRevealed() &&
          browser_view()->IsTabStripVisible();
 }
 
 bool BrowserNonClientFrameViewMus::UsePackagedAppHeaderStyle() const {
   Browser* browser = browser_view()->browser();
   // For non tabbed trusted source windows, e.g. Settings, use the packaged
   // app style frame.
   if (!browser->is_type_tabbed() && browser->is_trusted_source())
     return true;
-  // Use the packaged app style for apps that aren't using the newer WebApp
-  // style.
-  return browser->is_app() && !UseWebAppHeaderStyle();
-}
-
-bool BrowserNonClientFrameViewMus::UseWebAppHeaderStyle() const {
-  return browser_view()->browser()->SupportsWindowFeature(
-      Browser::FEATURE_WEBAPPFRAME);
+  // Use the packaged app style for apps.
+  return browser->is_app();

[tapted, 2016/12/06 23:52:28]

should this be a verbatim copy of
`BrowserNonClientFrameViewAsh::UsePackagedAppHeaderStyle()`? It's probably Ok
that it's copy-paste, but having them not be identical suggests that they're
different in some way (but I don't think they are).

[benwells, 2016/12/15 23:08:41]

Um, yeah. Made identical.

 }
 
 void BrowserNonClientFrameViewMus::LayoutIncognitoButton() {
   DCHECK(profile_indicator_icon());
 #if !defined(OS_CHROMEOS)
   // ChromeOS shows avatar on V1 app.
   DCHECK(browser_view()->IsTabStripVisible());
 #endif
   gfx::ImageSkia incognito_icon = GetIncognitoAvatarIcon();
   const int pad = GetLayoutConstant(AVATAR_ICON_PADDING);
@@ skipping 72 matching lines @@
 
   // Toolbar/content separator.
   toolbar_bounds.Inset(kClientEdgeThickness, 0);
   BrowserView::Paint1pxHorizontalLine(
       canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR),
       toolbar_bounds,
       true);
 }
 
 void BrowserNonClientFrameViewMus::PaintContentEdge(gfx::Canvas* canvas) {
-  DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle());
+  DCHECK(!UsePackagedAppHeaderStyle());
   const int bottom = frame_values().normal_insets.bottom();
   canvas->FillRect(
       gfx::Rect(0, bottom, width(), kClientEdgeThickness),
       GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR));
 }