Modifications to performance monitor UI to address real webui.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c5afe4343a8a0736ff3a75c37d09e29e42463c89..51b136c976d704b20207aea545f475868bdad434 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3284,7 +3284,6 @@
         'browser/ui/login/login_prompt.h',
         'browser/ui/media_stream_infobar_delegate.h',
         'browser/ui/media_stream_infobar_delegate.cc',
-        'browser/ui/metro_pinned_state_observer.h',
         'browser/ui/metro_pin_tab_helper.cc',
         'browser/ui/metro_pin_tab_helper.h',
         'browser/ui/network_profile_bubble.cc',
@@ -3497,6 +3496,8 @@
         'browser/ui/unload_controller.h',
         'browser/ui/user_data_dir_dialog.h',
         'browser/ui/view_ids.h',
+        'browser/ui/views/about_chrome_view.cc',
+        'browser/ui/views/about_chrome_view.h',
         'browser/ui/views/about_ipc_dialog.cc',
         'browser/ui/views/about_ipc_dialog.h',
         'browser/ui/views/accelerator_table.cc',
@@ -3736,6 +3737,10 @@
         'browser/ui/views/infobars/translate_message_infobar.h',
         'browser/ui/views/javascript_app_modal_dialog_views.cc',
         'browser/ui/views/javascript_app_modal_dialog_views.h',
+        'browser/ui/views/keyboard_overlay_delegate.cc',

[Dan Beam, 2012/08/03 18:40:36]

er, you seem to have leftover merge changes here, unless I'm
misunderstanding...?

[clintstaley, 2012/08/06 21:06:47]

Not sure what happened here -- apologies.  Fixed.

+        'browser/ui/views/keyboard_overlay_delegate.h',
+        'browser/ui/views/keyboard_overlay_dialog_view.cc',
+        'browser/ui/views/keyboard_overlay_dialog_view.h',
         'browser/ui/views/location_bar/action_box_button_view.cc',
         'browser/ui/views/location_bar/action_box_button_view.h',
         'browser/ui/views/location_bar/chrome_to_mobile_view.cc',
@@ -3756,8 +3761,6 @@
         'browser/ui/views/location_bar/location_bar_view.h',
         'browser/ui/views/location_bar/location_icon_view.cc',
         'browser/ui/views/location_bar/location_icon_view.h',
-        'browser/ui/views/location_bar/metro_pin_view.cc',
-        'browser/ui/views/location_bar/metro_pin_view.h',
         'browser/ui/views/location_bar/page_action_image_view.cc',
         'browser/ui/views/location_bar/page_action_image_view.h',
         'browser/ui/views/location_bar/page_action_with_badge_view.cc',
@@ -4170,6 +4173,8 @@
         'browser/ui/webui/options2/startup_pages_handler.h',
         'browser/ui/webui/options2/web_intents_settings_handler.cc',
         'browser/ui/webui/options2/web_intents_settings_handler.h',
+        'browser/ui/webui/performance_monitor/web_ui.cc',
+        'browser/ui/webui/performance_monitor/web_ui.h',
         'browser/ui/webui/performance_monitor/web_ui_handler.cc',
         'browser/ui/webui/performance_monitor/web_ui_handler.h',
         'browser/ui/webui/plugins_ui.cc',
@@ -4367,10 +4372,8 @@
             'browser/chromeos/extensions/file_browser_handler_api.h',
             'browser/chromeos/extensions/file_browser_private_api.cc',
             'browser/chromeos/extensions/file_browser_private_api.h',
-            'browser/chromeos/extensions/wallpaper_manager_util.cc',
-            'browser/chromeos/extensions/wallpaper_manager_util.h',
-            'browser/chromeos/extensions/wallpaper_private_api.cc',
-            'browser/chromeos/extensions/wallpaper_private_api.h',
+            'browser/chromeos/extensions/wallpaper_manager_api.cc',
+            'browser/chromeos/extensions/wallpaper_manager_api.h',
             'browser/chromeos/media/media_player_extension_api.cc',
             'browser/chromeos/media/media_player_extension_api.h',
             'browser/history/history_extension_api.cc',
@@ -5191,6 +5194,8 @@
             'browser/ui/crypto_module_password_dialog.cc',
             'browser/ui/crypto_module_password_dialog_nss.cc',
             'browser/ui/startup/autolaunch_prompt.cc',
+            'browser/ui/views/keyboard_overlay_delegate.cc',
+            'browser/ui/views/keyboard_overlay_dialog_view.cc',
             'browser/ui/views/simple_message_box_views.cc',
             'browser/ui/webui/help/version_updater_basic.cc',
             'browser/ui/webui/help/version_updater_basic.h',
@@ -5267,6 +5272,10 @@
               'sources/': [
                 ['exclude', '^browser/chromeos/extensions/file_browser_handler_api'],
                 ['exclude', '^browser/chromeos/extensions/file_browser_private_api'],
+                ['exclude', '^browser/ui/views/keyboard_overlay_delegate.cc'],
+                ['exclude', '^browser/ui/views/keyboard_overlay_delegate.h'],
+                ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.cc'],
+                ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.h'],
               ],
             }],
             # GTK build only