Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / location_bar / location_bar_view.h

diff --git a/src/chrome/browser/ui/views/location_bar/location_bar_view.h b/src/chrome/browser/ui/views/location_bar/location_bar_view.h
index ef987a9..31909f8 100644 (file)
--- a/src/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/src/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -41,11 +41,11 @@ class KeywordHintView;
 class LocationIconView;
 class OpenPDFInReaderView;
 class ManagePasswordsIconView;
+class OriginChipView;
 class PageActionWithBadgeView;
 class PageActionImageView;
 class Profile;
 class SelectedKeywordView;
-class SiteChipView;
 class StarView;
 class TemplateURLService;
 class TranslateIconView;
@@ -197,8 +197,8 @@ class LocationBarView : public LocationBar,
   // The translate icon. It may not be visible.
   TranslateIconView* translate_icon_view() { return translate_icon_view_; }
 
-  void set_site_chip_view(SiteChipView* site_chip_view) {
-    site_chip_view_ = site_chip_view;
+  void set_origin_chip_view(OriginChipView* origin_chip_view) {
+    origin_chip_view_ = origin_chip_view;
   }
 
   // Shows the bookmark prompt.
@@ -404,10 +404,6 @@ class LocationBarView : public LocationBar,
   // Helper to show the first run info bubble.
   void ShowFirstRunBubbleInternal();
 
-  // Draws backgrounds and borders for page actions.  Must be called
-  // after layout, so the |page_action_views_| have their bounds.
-  void PaintPageActionBackgrounds(gfx::Canvas* canvas);
-
   // Handles a request to change the value of this text field from software
   // using an accessibility API (typically automation software, screen readers
   // don't normally use this). Sets the value and clears the selection.
@@ -478,8 +474,8 @@ class LocationBarView : public LocationBar,
   // The page action icon views.
   PageActionViews page_action_views_;
 
-  // The Site Chip.
-  SiteChipView* site_chip_view_;
+  // The Origin Chip.
+  OriginChipView* origin_chip_view_;
 
   // The icon for Translate.
   TranslateIconView* translate_icon_view_;