Merge the LinuxUI interface from its own .so into libviews.so.

ui/views/linux_ui/status_icon_linux.h

 // Copyright 2013 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_LINUX_UI_STATUS_ICON_LINUX_H_
-#define UI_LINUX_UI_STATUS_ICON_LINUX_H_
+#ifndef UI_VIEWS_LINUX_UI_STATUS_ICON_LINUX_H_
+#define UI_VIEWS_LINUX_UI_STATUS_ICON_LINUX_H_
 
 #include "base/strings/string16.h"
-#include "ui/linux_ui/linux_ui_export.h"
+#include "ui/views/views_export.h"
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace ui {
 class MenuModel;
 }  // namespace ui
 
+namespace views {
+
 // Since liblinux_ui cannot have dependencies on any chrome browser components
 // we cannot inherit from StatusIcon. So we implement the necessary methods
 // and let a wrapper class implement the StatusIcon interface and defer the
 // callbacks to a delegate. For the same reason, do not use StatusIconMenuModel.
-class LINUX_UI_EXPORT StatusIconLinux {
+class VIEWS_EXPORT StatusIconLinux {
  public:
   class Delegate {
    public:
     virtual void OnClick() = 0;
     virtual bool HasClickAction() = 0;
 
    protected:
     virtual ~Delegate();
   };
 
@@ skipping 14 matching lines @@
   // need to manually refresh it when the menu model changes.
   virtual void RefreshPlatformContextMenu();
 
   Delegate* delegate() { return delegate_; }
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 
  private:
   Delegate* delegate_;
 };
 
+}  // namespace views
+
 #endif  // UI_LINUX_UI_STATUS_ICON_LINUX_H_