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

chrome/browser/ui/libgtk2ui/app_indicator_icon.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 CHROME_BROWSER_UI_LIBGTK2UI_APP_INDICATOR_ICON_H_
 #define CHROME_BROWSER_UI_LIBGTK2UI_APP_INDICATOR_ICON_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
 #include "ui/base/models/menu_model.h"
-#include "ui/linux_ui/status_icon_linux.h"
+#include "ui/views/linux_ui/status_icon_linux.h"
 
 typedef struct _AppIndicator AppIndicator;
 typedef struct _GtkWidget GtkWidget;
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace libgtk2ui {
 
-class AppIndicatorIcon : public StatusIconLinux {
+class AppIndicatorIcon : public views::StatusIconLinux {
  public:
   // The id uniquely identifies the new status icon from other chrome status
   // icons.
   explicit AppIndicatorIcon(std::string id,
                             const gfx::ImageSkia& image,
                             const string16& tool_tip);
   virtual ~AppIndicatorIcon();
 
   // Indicates whether libappindicator so could be opened.
   static bool CouldOpen();
 
-  // Overridden from StatusIconLinux:
+  // Overridden from views::StatusIconLinux:
   virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE;
   virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE;
   virtual void SetToolTip(const string16& tool_tip) OVERRIDE;
   virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) OVERRIDE;
   virtual void RefreshPlatformContextMenu() OVERRIDE;
 
  private:
   void SetImageFromFile(base::FilePath icon_file_path);
   void SetMenu();
 
@@ skipping 25 matching lines @@
   ui::MenuModel* menu_model_;
 
   base::FilePath icon_file_path_;
   int icon_change_count_;
   bool block_activation_;
 };
 
 }  // namespace libgtk2ui
 
 #endif  // CHROME_BROWSER_UI_LIBGTK2UI_APP_INDICATOR_ICON_H_