Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / location_bar / origin_chip_view.cc

diff --git a/src/chrome/browser/ui/views/location_bar/origin_chip_view.cc b/src/chrome/browser/ui/views/location_bar/origin_chip_view.cc
index ddc6127..5ee0eed 100644 (file)
--- a/src/chrome/browser/ui/views/location_bar/origin_chip_view.cc
+++ b/src/chrome/browser/ui/views/location_bar/origin_chip_view.cc
@@ -50,11 +50,10 @@ class OriginChipExtensionIcon : public extensions::IconImage::Observer {
   OriginChipExtensionIcon(LocationIconView* icon_view,
                           Profile* profile,
                           const extensions::Extension* extension);
-  virtual ~OriginChipExtensionIcon();
+  ~OriginChipExtensionIcon() override;
 
   // IconImage::Observer:
-  virtual void OnExtensionIconImageChanged(
-      extensions::IconImage* image) OVERRIDE;
+  void OnExtensionIconImageChanged(extensions::IconImage* image) override;
 
  private:
   LocationIconView* icon_view_;
@@ -347,7 +346,7 @@ void OriginChipView::SetBorderImages(const int images[3][9]) {
   pressed_text_color_ = host_label_->enabled_color();
   host_label_->SetBackgroundColor(background_colors_[state()]);
 
-  SetBorder(border.PassAs<views::Border>());
+  SetBorder(border.Pass());
 }
 
 void OriginChipView::AnimationProgressed(const gfx::Animation* animation) {