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

chrome/browser/ui/libgtk2ui/gtk2_ui.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/environment.h"
@@ skipping 377 matching lines @@
 
 void Gtk2UI::SetProgressFraction(float percentage) const {
   if (unity::IsRunning())
     unity::SetProgressFraction(percentage);
 }
 
 bool Gtk2UI::IsStatusIconSupported() const {
   return AppIndicatorIcon::CouldOpen();
 }
 
-scoped_ptr<StatusIconLinux> Gtk2UI::CreateLinuxStatusIcon(
+scoped_ptr<views::StatusIconLinux> Gtk2UI::CreateLinuxStatusIcon(
     const gfx::ImageSkia& image,
     const string16& tool_tip) const {
   if (AppIndicatorIcon::CouldOpen()) {
     ++indicators_count;
-    return scoped_ptr<StatusIconLinux>(new AppIndicatorIcon(
+    return scoped_ptr<views::StatusIconLinux>(new AppIndicatorIcon(
         base::StringPrintf("%s%d", kAppIndicatorIdPrefix, indicators_count),
         image,
         tool_tip));
   } else {
-    return scoped_ptr<StatusIconLinux>();
+    return scoped_ptr<views::StatusIconLinux>();
   }
 }
 
 ui::SelectFileDialog* Gtk2UI::CreateSelectFileDialog(
     ui::SelectFileDialog::Listener* listener,
     ui::SelectFilePolicy* policy) const {
   return SelectFileDialogImpl::Create(listener, policy);
 }
 
 void Gtk2UI::GetScrollbarColors(GdkColor* thumb_active_color,
@@ skipping 616 matching lines @@
 
   return border;
 }
 
 void Gtk2UI::ClearAllThemeData() {
   gtk_images_.clear();
 }
 
 }  // namespace libgtk2ui
 
-ui::LinuxUI* BuildGtk2UI() {
+views::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }