Fix bustage

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71971 0039d316-1c4b-4281-b951-d872f2087c98

app/app.gyp

@@ -48,6 +48,8 @@
         '../ui/base/models/tree_node_iterator_unittest.cc',
         '../ui/base/models/tree_node_model_unittest.cc',
         '../ui/base/system_monitor/system_monitor_unittest.cc',
+        '../ui/base/text/text_elider_unittest.cc',
+        '../ui/base/view_prop_unittest.cc',
         'data_pack_unittest.cc',
         'l10n_util_mac_unittest.mm',
         'l10n_util_unittest.cc',
@@ -57,8 +59,6 @@
         'sql/transaction_unittest.cc',
         'test_suite.h',
         'test/data/resource.h',
-        'text_elider_unittest.cc',
-        'view_prop_unittest.cc',
         'win/win_util_unittest.cc',
       ],
       'include_dirs': [
@@ -78,7 +78,7 @@
         ['OS!="win"', {
           'sources!': [
             '../ui/base/dragdrop/os_exchange_data_win_unittest.cc',
-            'view_prop_unittest.cc',
+            '../ui/base/view_prop_unittest.cc',
             'win_util_unittest.cc',
           ],
         }],

app/app_base.gypi

@@ -33,12 +33,12 @@
             'sources!': [
               '../ui/base/dragdrop/gtk_dnd_util.cc',
               '../ui/base/dragdrop/gtk_dnd_util.h',
-              'gtk_signal.h',
-              'gtk_signal_registrar.cc',
-              'gtk_signal_registrar.h',
-              'x11_util.cc',
-              'x11_util.h',
-              'x11_util_internal.h',
+              '../ui/base/gtk/gtk_signal.h',
+              '../ui/base/gtk/gtk_signal_registrar.cc',
+              '../ui/base/gtk/gtk_signal_registrar.h',
+              '../ui/base/x/x11_util.cc',
+              '../ui/base/x/x11_util.h',
+              '../ui/base/x/x11_util_internal.h',
             ],
           }],
         ],
@@ -127,6 +127,11 @@
         '../ui/base/dragdrop/os_exchange_data_provider_win.h',
         '../ui/base/dragdrop/os_exchange_data.cc',
         '../ui/base/dragdrop/os_exchange_data.h', 
+        '../ui/base/gtk/event_synthesis_gtk.cc',
+        '../ui/base/gtk/event_synthesis_gtk.h',
+        '../ui/base/gtk/gtk_signal.h',
+        '../ui/base/gtk/gtk_signal_registrar.cc',
+        '../ui/base/gtk/gtk_signal_registrar.h',
         '../ui/base/keycodes/keyboard_code_conversion.cc',
         '../ui/base/keycodes/keyboard_code_conversion.h',
         '../ui/base/keycodes/keyboard_code_conversion_gtk.cc',
@@ -140,6 +145,9 @@
         '../ui/base/keycodes/keyboard_codes.h',
         '../ui/base/keycodes/keyboard_codes_win.h',
         '../ui/base/keycodes/keyboard_codes_posix.h',
+        '../ui/base/l10n/l10n_font_util.h',
+        '../ui/base/l10n/l10n_font_util.cc',
+        '../ui/base/message_box_flags.h',
         '../ui/base/models/accelerator.h',
         '../ui/base/models/accelerator_gtk.h',
         '../ui/base/models/accelerator_cocoa.h',
@@ -153,18 +161,23 @@
         '../ui/base/models/table_model.cc',
         '../ui/base/models/table_model.h',
         '../ui/base/models/table_model_observer.h',
+        '../ui/base/text/text_elider.cc',
+        '../ui/base/text/text_elider.h',
+        '../ui/base/theme_provider.cc',
+        '../ui/base/theme_provider.h',
+        '../ui/base/view_prop.cc',
+        '../ui/base/view_prop.h',
         '../ui/base/win/hwnd_util.cc',
         '../ui/base/win/hwnd_util.h',
         '../ui/base/win/window_impl.cc',
         '../ui/base/win/window_impl.h',
-        'active_window_watcher_x.cc',
-        'active_window_watcher_x.h',
+        '../ui/base/x/active_window_watcher_x.cc',
+        '../ui/base/x/active_window_watcher_x.h',
+        '../ui/base/x/x11_util.cc',
+        '../ui/base/x/x11_util.h',
+        '../ui/base/x/x11_util_internal.h',
         'data_pack.cc',
         'data_pack.h',
-        'event_synthesis_gtk.cc',
-        'event_synthesis_gtk.h',
-        'gfx/font_util.h',
-        'gfx/font_util.cc',
         'gfx/gl/gl_bindings.h',
         'gfx/gl/gl_context.cc',
         'gfx/gl/gl_context.h',
@@ -183,9 +196,6 @@
         'gfx/gl/gl_implementation_win.cc',
         'gfx/gl/gl_interface.h',
         'gfx/gl/gl_interface.cc',
-        'gtk_signal.h',
-        'gtk_signal_registrar.cc',
-        'gtk_signal_registrar.h',
         'l10n_util.cc',
         'l10n_util.h',
         'l10n_util_collator.h',
@@ -197,7 +207,6 @@
         'mac/nsimage_cache.h',
         'mac/nsimage_cache.mm',
         'mac/scoped_nsdisable_screen_updates.h',
-        'message_box_flags.h',
         'resource_bundle.cc',
         'resource_bundle.h',
         'resource_bundle_linux.cc',
@@ -222,12 +231,6 @@
         'surface/transport_dib_linux.cc',
         'surface/transport_dib_mac.cc',
         'surface/transport_dib_win.cc',
-        'text_elider.cc',
-        'text_elider.h',
-        'theme_provider.cc',
-        'theme_provider.h',
-        'view_prop.cc',
-        'view_prop.h',
         'win/iat_patch_function.cc',
         'win/iat_patch_function.h',
         'win/scoped_co_mem.h',
@@ -238,9 +241,6 @@
         'win/shell.h',
         'win/win_util.cc',
         'win/win_util.h',
-        'x11_util.cc',
-        'x11_util.h',
-        'x11_util_internal.h',
         '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc',
         '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h',
         '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc',
@@ -322,12 +322,6 @@
             '../ui/base/dragdrop/drop_target.cc',
             '../ui/base/dragdrop/drop_target.h',
             '../ui/base/dragdrop/os_exchange_data.cc',
-            'gfx/gdi_util.cc',
-            'gfx/gdi_util.h',
-            'gfx/icon_util.cc',
-            'gfx/icon_util.h',
-            'gfx/native_theme_win.cc',
-            'gfx/native_theme_win.h',
             'view_prop.cc',
             'view_prop.h',
             'win/iat_patch_function.cc',
@@ -382,8 +376,8 @@
             '../ui/base/keycodes/keyboard_code_conversion_x.cc',
             '../ui/base/keycodes/keyboard_code_conversion_x.h',
             '../ui/base/keycodes/keyboard_codes_win.h',
-            'event_synthesis_gtk.cc',
-            'event_synthesis_gtk.h',
+            '../ui/base/gtk/event_synthesis_gtk.cc',
+            '../ui/base/gtk/event_synthesis_gtk.h',
           ],
         }],
         ['OS=="win"', {
@@ -406,8 +400,8 @@
             '../ui/base/keycodes/keyboard_code_conversion_x.cc',
             '../ui/base/keycodes/keyboard_code_conversion_x.h',
             '../ui/base/keycodes/keyboard_codes_posix.h',
-            'event_synthesis_gtk.cc',
-            'event_synthesis_gtk.h',
+            '../ui/base/gtk/event_synthesis_gtk.cc',
+            '../ui/base/gtk/event_synthesis_gtk.h',
           ],
         }],
       ],

chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc

@@ -37,7 +37,7 @@
 #include "ui/base/l10n/l10n_font_util.h"
 
 #if defined(TOOLKIT_GTK)
-#include "chrome/browser/gtk/html_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/html_dialog_gtk.h"
 #endif  // defined(TOOLKIT_GTK)
 
 #if defined(TOOLKIT_VIEWS)

views/widget/widget_win.cc

@@ -5,7 +5,6 @@
 #include "views/widget/widget_win.h"
 
 #include "app/l10n_util_win.h"
-#include "app/view_prop.h"
 #include "app/win/win_util.h"
 #include "base/string_util.h"
 #include "gfx/canvas_skia.h"
@@ -13,6 +12,8 @@
 #include "gfx/path.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/system_monitor/system_monitor.h"
+#include "ui/base/theme_provider.h"
+#include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/controls/native_control_win.h"
@@ -27,7 +28,7 @@
 #include "views/widget/widget_utils.h"
 #include "views/window/window_win.h"
 
-using app::ViewProp;
+using ui::ViewProp;
 
 namespace views {