Remove unreleased web app frame code from ChromeOS

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc
index 58cf38f81fbc7746d4234cd7f43134b57d8f1423..38d8888dcc8dad76129860434fbe6c96e3c14acd 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc
@@ -15,7 +15,6 @@
 #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"
@@ -266,7 +265,7 @@ void BrowserNonClientFrameViewMus::OnPaint(gfx::Canvas* canvas) {
 
   if (browser_view()->IsToolbarVisible())
     PaintToolbarBackground(canvas);
-  else if (!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle())
+  else if (!UsePackagedAppHeaderStyle())
     PaintContentEdge(canvas);
 }
 
@@ -407,14 +406,8 @@ bool BrowserNonClientFrameViewMus::UsePackagedAppHeaderStyle() const {
   // 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() {
@@ -507,7 +500,7 @@ void BrowserNonClientFrameViewMus::PaintToolbarBackground(gfx::Canvas* canvas) {
 }
 
 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),