Remove non-md code in location bar (Views).

chrome/browser/ui/views/location_bar/location_bar_view.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 94 matching lines @@
   };
 
   enum ColorKind {
     BACKGROUND = 0,
     TEXT,
     SELECTED_TEXT,
     DEEMPHASIZED_TEXT,
     SECURITY_CHIP_TEXT,
   };
 
+  // Width (and height) of icons in location bar.
+  static constexpr int kLocationBarIconWidth = 16;
+
   // The location bar view's class name.
   static const char kViewClassName[];
 
   LocationBarView(Browser* browser,
                   Profile* profile,
                   CommandUpdater* command_updater,
                   Delegate* delegate,
                   bool is_popup_mode);
 
   ~LocationBarView() override;
 
-  // Returns the color for the location bar border in MD windows and non-MD
-  // popup windows, given the window's |incognito| state.
+  // Returns the color for the location bar border given the window's
+  // |incognito| state.
   static SkColor GetBorderColor(bool incognito);
 
   // Initializes the LocationBarView.
   void Init();
 
   // True if this instance has been initialized by calling Init, which can only
   // be called when the receiving instance is attached to a view container.
   bool IsInitialized() const;
 
   // Returns the appropriate color for the desired kind, based on the user's
@@ skipping 41 matching lines @@
     return save_credit_card_icon_view_;
   }
 
   // The translate icon. It may not be visible.
   TranslateIconView* translate_icon_view() { return translate_icon_view_; }
 
   // Returns the screen coordinates of the omnibox (where the URL text appears,
   // not where the icons are shown).
   gfx::Point GetOmniboxViewOrigin() const;
 
-  // Returns the width of the location icon.
-  int GetLocationIconWidth() const;
-
   // Shows |text| as an inline autocompletion.  This is useful for IMEs, where
   // we can't show the autocompletion inside the actual OmniboxView.  See
   // comments on |ime_inline_autocomplete_view_|.
   void SetImeInlineAutocompletion(const base::string16& text);
 
   // Invoked from OmniboxViewWin to show gray text autocompletion.
   void SetGrayTextAutocompletion(const base::string16& text);
 
   // Returns the current gray text autocompletion.
   base::string16 GetGrayTextAutocompletion() const;
@@ skipping 66 matching lines @@
   // Helper for GetMinimumWidth().  Calculates the incremental minimum width
   // |view| should add to the trailing width after the omnibox.
   int IncrementalMinimumWidth(views::View* view) const;
 
   // Returns the thickness of any visible edge, in pixels.
   int GetHorizontalEdgeThickness() const;
   int GetVerticalEdgeThickness() const;
 
   // Returns the total amount of space reserved above or below the content,
   // which is the vertical edge thickness plus the padding next to it.
-  int GetVerticalEdgeThicknessWithPadding() const;
+  int GetTotalVerticalPadding() const;
 
   // Updates |location_icon_view_| based on the current state and theme.
   void RefreshLocationIcon();
 
   // Updates the visibility state of the Content Blocked icons to reflect what
   // is actually blocked on the current page. Returns true if the visibility
   // of at least one of the views in |content_setting_views_| changed.
   bool RefreshContentSettingViews();
 
   // Clears |page_action_views_| and removes the elements from the view
@@ skipping 75 matching lines @@
   ExtensionAction* GetPageAction(size_t index) override;
   ExtensionAction* GetVisiblePageAction(size_t index) override;
   void TestPageActionPressed(size_t index) override;
   bool GetBookmarkStarVisibility() override;
 
   // views::View:
   const char* GetClassName() const override;
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void OnFocus() override;
   void OnPaint(gfx::Canvas* canvas) override;
-  void PaintChildren(const ui::PaintContext& context) override;
 
   // views::DragController:
   void WriteDragDataForView(View* sender,
                             const gfx::Point& press_pt,
                             OSExchangeData* data) override;
   int GetDragOperationsForView(View* sender, const gfx::Point& p) override;
   bool CanStartDragForView(View* sender,
                            const gfx::Point& press_pt,
                            const gfx::Point& p) override;
 
@@ skipping 14 matching lines @@
   // The Browser this LocationBarView is in.  Note that at least
   // chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser
   // window, so this may be NULL.
   Browser* browser_;
 
   OmniboxViewViews* omnibox_view_;
 
   // Our delegate.
   Delegate* delegate_;
 
-  // Object used to paint the border. Not used for material design.
-  std::unique_ptr<views::Painter> border_painter_;
-
   // An icon to the left of the edit field: the HTTPS lock, blank page icon,
   // search icon, EV HTTPS bubble, etc.
   LocationIconView* location_icon_view_;
 
   // A view to show inline autocompletion when an IME is active.  In this case,
   // we shouldn't change the text or selection inside the OmniboxView itself,
   // since this will conflict with the IME's control over the text.  So instead
   // we show any autocompletion in a separate field after the OmniboxView.
   views::Label* ime_inline_autocomplete_view_;
 
@@ skipping 60 matching lines @@
   bool web_contents_null_at_last_refresh_;
 
   // These allow toggling the verbose security state behavior via flags.
   bool should_show_secure_state_;
   bool should_animate_secure_state_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_