Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / wm / overview / window_grid.cc

diff --git a/src/ash/wm/overview/window_grid.cc b/src/ash/wm/overview/window_grid.cc
index e8751b8..4ce8ddd 100644 (file)
--- a/src/ash/wm/overview/window_grid.cc
+++ b/src/ash/wm/overview/window_grid.cc
@@ -38,10 +38,10 @@ class CleanupWidgetAfterAnimationObserver
  public:
   explicit CleanupWidgetAfterAnimationObserver(
       scoped_ptr<views::Widget> widget);
-  virtual ~CleanupWidgetAfterAnimationObserver();
+  ~CleanupWidgetAfterAnimationObserver() override;
 
   // ui::ImplicitAnimationObserver:
-  virtual void OnImplicitAnimationsCompleted() OVERRIDE;
+  void OnImplicitAnimationsCompleted() override;
 
  private:
   scoped_ptr<views::Widget> widget_;
@@ -186,7 +186,7 @@ void WindowGrid::PositionWindows(bool animate) {
 
   // If the text filtering feature is enabled, reserve space at the top for the
   // text filtering textbox to appear.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshDisableTextFilteringInOverviewMode)) {
     total_bounds.Inset(
         0,