Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / extensions / media_galleries_dialog_views.cc

diff --git a/src/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/src/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
index 4ab4050..88ca64c 100644 (file)
--- a/src/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
+++ b/src/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
+#include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/popup_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -36,9 +36,9 @@ const int kScrollAreaHeight = 192;
 class ScrollableView : public views::View {
  public:
   ScrollableView() {}
-  virtual ~ScrollableView() {}
+  ~ScrollableView() override {}
 
-  virtual void Layout() OVERRIDE;
+  void Layout() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScrollableView);