Modifications to performance monitor UI to address real webui.

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 3266 matching lines @@
         'browser/ui/intents/web_intent_picker_model.cc',
         'browser/ui/intents/web_intent_picker_model.h',
         'browser/ui/intents/web_intent_picker_model_observer.h',
         'browser/ui/intents/web_intents_model.cc',
         'browser/ui/intents/web_intents_model.h',
         'browser/ui/login/login_model.h',
         'browser/ui/login/login_prompt.cc',
         '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',
         'browser/ui/network_profile_bubble.h',
         'browser/ui/omnibox/location_bar.h',
         'browser/ui/omnibox/location_bar_util.cc',
         'browser/ui/omnibox/location_bar_util.h',
         'browser/ui/omnibox/omnibox_edit_controller.h',
         'browser/ui/omnibox/omnibox_edit_model.cc',
         'browser/ui/omnibox/omnibox_edit_model.h',
@@ skipping 192 matching lines @@
         'browser/ui/toolbar/toolbar_model_delegate.h',
         'browser/ui/toolbar/wrench_menu_model.cc',
         'browser/ui/toolbar/wrench_menu_model.h',
         'browser/ui/uma_browsing_activity_observer.cc',
         'browser/ui/uma_browsing_activity_observer.h',
         'browser/ui/uninstall_browser_prompt.h',
         'browser/ui/unload_controller.cc',
         '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',
         'browser/ui/views/accelerator_table.h',
         'browser/ui/views/accessibility/accessibility_event_router_views.cc',
         'browser/ui/views/accessibility/accessibility_event_router_views.h',
         'browser/ui/views/accessibility/invert_bubble_view.cc',
         'browser/ui/views/accessibility/invert_bubble_view.h',
         'browser/ui/views/app_menu_button_win.cc',
         'browser/ui/views/app_menu_button_win.h',
@@ skipping 219 matching lines @@
         'browser/ui/views/infobars/link_infobar.cc',
         'browser/ui/views/infobars/link_infobar.h',
         'browser/ui/views/infobars/media_stream_infobar.cc',
         'browser/ui/views/infobars/media_stream_infobar.h',
         'browser/ui/views/infobars/translate_infobar_base.cc',
         'browser/ui/views/infobars/translate_infobar_base.h',
         'browser/ui/views/infobars/translate_message_infobar.cc',
         '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',
         'browser/ui/views/location_bar/chrome_to_mobile_view.h',
         'browser/ui/views/location_bar/content_setting_image_view.cc',
         'browser/ui/views/location_bar/content_setting_image_view.h',
         'browser/ui/views/location_bar/ev_bubble_view.cc',
         'browser/ui/views/location_bar/ev_bubble_view.h',
         'browser/ui/views/location_bar/icon_label_bubble_view.cc',
         'browser/ui/views/location_bar/icon_label_bubble_view.h',
         'browser/ui/views/location_bar/keyword_hint_view.cc',
         'browser/ui/views/location_bar/keyword_hint_view.h',
         'browser/ui/views/location_bar/location_bar_container.cc',
         'browser/ui/views/location_bar/location_bar_container.h',
         'browser/ui/views/location_bar/location_bar_container_aura.cc',
         'browser/ui/views/location_bar/location_bar_container_win.cc',
         'browser/ui/views/location_bar/location_bar_view.cc',
         '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',
         'browser/ui/views/location_bar/page_action_with_badge_view.h',
         'browser/ui/views/location_bar/page_info_helper.cc',
         'browser/ui/views/location_bar/page_info_helper.h',
         'browser/ui/views/location_bar/selected_keyword_view.cc',
         'browser/ui/views/location_bar/selected_keyword_view.h',
         'browser/ui/views/location_bar/star_view.cc',
         'browser/ui/views/location_bar/star_view.h',
@@ skipping 392 matching lines @@
         'browser/ui/webui/options2/options_ui.cc',
         'browser/ui/webui/options2/options_ui.h',
         'browser/ui/webui/options2/password_manager_handler.cc',
         'browser/ui/webui/options2/password_manager_handler.h',
         'browser/ui/webui/options2/search_engine_manager_handler.cc',
         'browser/ui/webui/options2/search_engine_manager_handler.h',
         'browser/ui/webui/options2/startup_pages_handler.cc',
         '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',
         'browser/ui/webui/plugins_ui.h',
         'browser/ui/webui/policy_ui.cc',
         'browser/ui/webui/policy_ui.h',
         'browser/ui/webui/predictors/predictors_handler.cc',
         'browser/ui/webui/predictors/predictors_handler.h',
         'browser/ui/webui/predictors/predictors_ui.cc',
         'browser/ui/webui/predictors/predictors_ui.h',
@@ skipping 177 matching lines @@
             'browser/accessibility/accessibility_extension_api.cc',
             'browser/accessibility/accessibility_extension_api.h',
             'browser/bookmarks/bookmark_extension_api.cc',
             'browser/bookmarks/bookmark_extension_api.h',
             'browser/chromeos/extensions/echo_private_api.cc',
             'browser/chromeos/extensions/echo_private_api.h',
             'browser/chromeos/extensions/file_browser_handler_api.cc',
             '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',
             'browser/history/history_extension_api.h',
             'browser/history/top_sites_extension_api.cc',
             'browser/history/top_sites_extension_api.h',
             'browser/infobars/infobar_extension_api.cc',
             'browser/infobars/infobar_extension_api.h',
             'browser/rlz/rlz_extension_api.cc',
             'browser/rlz/rlz_extension_api.h',
@@ skipping 800 matching lines @@
           'sources!': [
             'browser/history/history_publisher_none.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/lifetime/application_lifetime_stub.cc',
             'browser/ui/certificate_dialogs.cc',
             'browser/ui/certificate_dialogs.h',
             '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',
             'browser/ui/webui/tab_modal_confirm_dialog_webui.cc',
             'browser/ui/webui/tab_modal_confirm_dialog_webui.h',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
@@ skipping 56 matching lines @@
                 ['exclude', '^browser/ui/views/'],
                 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.cc'],
                 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.h']
               ]
             }],
             # Build Aura on desktop linux
             ['OS=="linux" and use_aura==1 and chromeos==0', {
               '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
             ['toolkit_uses_gtk==1', {
               'sources/': [
                 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
                 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
@@ skipping 215 matching lines @@
           'variables': {
             'jni_gen_dir': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }