roll clang 131935:132017

ui/base/x/active_window_watcher_x.h

 // Copyright (c) 2011 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 UI_BASE_X_ACTIVE_WINDOW_WATCHER_X_H_
 #define UI_BASE_X_ACTIVE_WINDOW_WATCHER_X_H_
 #pragma once
 
 #include <gdk/gdk.h>
 
@@ skipping 24 matching lines @@
   static void RemoveObserver(Observer* observer);
 
   // Checks if the WM supports the active window property. Note that the return
   // value can change, especially during system startup.
   static bool WMSupportsActivation();
 
  private:
   friend struct DefaultSingletonTraits<ActiveWindowWatcherX>;
 
   ActiveWindowWatcherX();
-  ~ActiveWindowWatcherX();
+  virtual ~ActiveWindowWatcherX();
 
   void Init();
 
   // Sends a notification out through the NotificationService that the active
   // window has changed.
   void NotifyActiveWindowChanged();
 
   // Callback for PropertyChange XEvents.
   CHROMEG_CALLBACK_1(ActiveWindowWatcherX, GdkFilterReturn,
                      OnWindowXEvent, GdkXEvent*, GdkEvent*);
 
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ActiveWindowWatcherX);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_X_ACTIVE_WINDOW_WATCHER_X_H_