Checkin for CL: http://codereview.chromium.org/3061044/show...

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi	(revision 56646)
+++ chrome/chrome_browser.gypi	(working copy)
@@ -327,8 +327,8 @@
         'browser/bug_report_util.h',
         # TODO(rkc): Find a better way to include these files
         '<(protoc_out_dir)/chrome/browser/userfeedback/proto/annotations.pb.cc',
+        '<(protoc_out_dir)/chrome/browser/userfeedback/proto/chrome.pb.cc',
         '<(protoc_out_dir)/chrome/browser/userfeedback/proto/common.pb.cc',
-        '<(protoc_out_dir)/chrome/browser/userfeedback/proto/config.pb.cc',
         '<(protoc_out_dir)/chrome/browser/userfeedback/proto/dom.pb.cc',
         '<(protoc_out_dir)/chrome/browser/userfeedback/proto/extension.pb.cc',
         '<(protoc_out_dir)/chrome/browser/userfeedback/proto/math.pb.cc',
@@ -1138,6 +1138,8 @@
         'browser/dom_ui/autofill_options_handler.h',
         'browser/dom_ui/bookmarks_ui.cc',
         'browser/dom_ui/bookmarks_ui.h',
+        'browser/dom_ui/bug_report_ui.cc',
+        'browser/dom_ui/bug_report_ui.h',
         'browser/dom_ui/chrome_url_data_manager.cc',
         'browser/dom_ui/chrome_url_data_manager.h',
         'browser/dom_ui/about_page_handler.cc',
@@ -1182,6 +1184,8 @@
         'browser/dom_ui/dom_ui_factory.h',
         'browser/dom_ui/dom_ui_favicon_source.cc',
         'browser/dom_ui/dom_ui_favicon_source.h',
+        'browser/dom_ui/dom_ui_screenshot_source.cc',
+        'browser/dom_ui/dom_ui_screenshot_source.h',
         'browser/dom_ui/dom_ui_theme_source.cc',
         'browser/dom_ui/dom_ui_theme_source.h',
         'browser/dom_ui/dom_ui_thumbnail_source.cc',
@@ -2670,8 +2674,6 @@
         'browser/views/browser_dialogs.h',
         'browser/views/bubble_border.cc',
         'browser/views/bubble_border.h',
-        'browser/views/bug_report_view.cc',
-        'browser/views/bug_report_view.h',
         'browser/views/certificate_viewer_win.cc',
         'browser/views/chrome_views_delegate.cc',
         'browser/views/chrome_views_delegate.h',
@@ -3391,8 +3393,6 @@
                 ['include', '^browser/views/browser_bubble.h'],
                 ['include', '^browser/views/bubble_border.cc'],
                 ['include', '^browser/views/bubble_border.h'],
-                ['include', '^browser/views/bug_report_view.cc'],
-                ['include', '^browser/views/bug_report_view.h'],
                 ['include', '^browser/views/chrome_views_delegate.cc'],
                 ['include', '^browser/views/clear_browsing_data.cc'],
                 ['include', '^browser/views/clear_browsing_data.h'],
@@ -3797,8 +3797,8 @@
       'type': 'none',
       'sources': [
         'browser/userfeedback/proto/annotations.proto',
+        'browser/userfeedback/proto/chrome.proto',
         'browser/userfeedback/proto/common.proto',
-        'browser/userfeedback/proto/config.proto',
         'browser/userfeedback/proto/dom.proto',
         'browser/userfeedback/proto/extension.proto',
         'browser/userfeedback/proto/math.proto',