Remove unreleased web app frame code from ChromeOS

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

 // Copyright 2012 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_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 1017 matching lines @@
     toolbar_->reload_button()->ChangeMode(
         is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,
         force);
   }
 }
 
 void BrowserView::UpdateToolbar(content::WebContents* contents) {
   // We may end up here during destruction.
   if (toolbar_)
     toolbar_->Update(contents);
-  frame_->UpdateToolbar();
 }
 
 void BrowserView::ResetToolbarTabState(content::WebContents* contents) {
   // We may end up here during destruction.
   if (toolbar_)
     toolbar_->ResetTabState(contents);
 }
 
 void BrowserView::FocusToolbar() {
   // Temporarily reveal the top-of-window views (if not already revealed) so
@@ skipping 227 matching lines @@
 
 void BrowserView::UserChangedTheme() {
   frame_->FrameTypeChanged();
 }
 
 void BrowserView::ShowWebsiteSettings(
     Profile* profile,
     content::WebContents* web_contents,
     const GURL& virtual_url,
     const security_state::SecurityInfo& security_info) {
-  // Some browser windows have a location icon embedded in the frame. Try to
-  // use that if it exists. If it doesn't exist, use the location icon from
-  // the location bar.
-  views::View* popup_anchor =
-      ui::MaterialDesignController::IsSecondaryUiMaterial()
-          ? toolbar_->location_bar()
-          : frame_->GetLocationIconView();
-  if (!popup_anchor)
+  views::View* popup_anchor = nullptr;
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
+    popup_anchor = toolbar_->location_bar();
+  else

[tapted, 2016/12/16 03:30:36]

this logic isn't quite the same, but I guess location_bar() is guaranteed to
return non-null, so that should be fine.

[benwells, 2016/12/19 03:59:06]

Yep, that was my thinking. I think this is clearer than what the alternative
would be.

     popup_anchor = GetLocationBarView()->location_icon_view()->GetImageView();
 
   WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile,
                                       web_contents, virtual_url, security_info);
 }
 
 void BrowserView::ShowAppMenu() {
   if (!toolbar_->app_menu_button())
     return;
 
@@ skipping 352 matching lines @@
 }
 
 views::View* BrowserView::GetInitiallyFocusedView() {
   return nullptr;
 }
 
 bool BrowserView::ShouldShowWindowTitle() const {
 #if defined(USE_ASH)
   // For Ash only, trusted windows (apps and settings) do not show a title,
   // crbug.com/119411. Child windows (i.e. popups) do show a title.
-  if (browser_->is_trusted_source() &&
-      !browser_->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME))
+  if (browser_->is_trusted_source())
     return false;
 #endif  // USE_ASH
 
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 gfx::ImageSkia BrowserView::GetWindowAppIcon() {
   if (browser_->is_app()) {
     WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
     extensions::TabHelper* extensions_tab_helper =
@@ skipping 13 matching lines @@
 
   if (browser_->is_app() || browser_->is_type_popup())
     return browser_->GetCurrentPageIcon().AsImageSkia();
   return gfx::ImageSkia();
 }
 
 bool BrowserView::ShouldShowWindowIcon() const {
 #if defined(USE_ASH)
   // For Ash only, trusted windows (apps and settings) do not show an icon,
   // crbug.com/119411. Child windows (i.e. popups) do show an icon.
-  if (browser_->is_trusted_source() &&
-      !browser_->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME))
+  if (browser_->is_trusted_source())
     return false;
 #endif  // USE_ASH
 
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 bool BrowserView::ExecuteWindowsCommand(int command_id) {
   // This function handles WM_SYSCOMMAND, WM_APPCOMMAND, and WM_COMMAND.
 #if defined(OS_WIN)
   if (command_id == IDC_DEBUG_FRAME_TOGGLE)
@@ skipping 931 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }