Make BubbleWindow a Widget override with a BubbleFrameView.

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 466 matching lines @@
         'browser/chromeos/external_protocol_dialog.cc',
         'browser/chromeos/external_protocol_dialog.h',
         'browser/chromeos/frame/browser_frame_view_chromeos.cc',
         'browser/chromeos/frame/browser_frame_view_chromeos.h',
         'browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc',
         'browser/chromeos/frame/browser_view.cc',
         'browser/chromeos/frame/browser_view.h',
         'browser/chromeos/frame/bubble_frame_view.cc',
         'browser/chromeos/frame/bubble_frame_view.h',
         'browser/chromeos/frame/bubble_window.h',
-        'browser/chromeos/frame/bubble_window_gtk.cc',
-        'browser/chromeos/frame/bubble_window_style.cc',
-        'browser/chromeos/frame/bubble_window_style.h',
+        'browser/chromeos/frame/bubble_window.cc',
         'browser/chromeos/frame/layout_mode_button.cc',
         'browser/chromeos/frame/layout_mode_button.h',
         'browser/chromeos/frame/panel_browser_view.cc',
         'browser/chromeos/frame/panel_browser_view.h',
         'browser/chromeos/frame/panel_controller.cc',
         'browser/chromeos/frame/panel_controller.h',
         'browser/chromeos/gview_request_interceptor.cc',
         'browser/chromeos/gview_request_interceptor.h',
         'browser/chromeos/input_method/candidate_window.cc',
         'browser/chromeos/input_method/candidate_window.h',
@@ skipping 4620 matching lines @@
             ['include', '^browser/ui/views/frame/browser_non_client_frame_view_aura.h'],
             ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc'],
             ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
             ['include', '^browser/ui/views/native_constrained_window_aura.cc'],
             ['include', '^browser/ui/views/stubs_aura.cc'],
           ],
         }],
         # Build Aura with ChromeOS.
         ['use_aura==1 and chromeos==1', {
           'sources/': [
-            ['exclude', '^browser/chromeos/frame/'],
+            ['exclude', '^browser/chromeos/frame/panel_controller.cc'],
+            ['exclude', '^browser/chromeos/frame/panel_controller.h'],
+            ['exclude', '^browser/chromeos/frame/browser_view.cc'],
+            ['exclude', '^browser/chromeos/frame/browser_view.h'],
+            ['exclude', '^browser/chromeos/frame/panel_browser_view.cc'],
+            ['exclude', '^browser/chromeos/frame/panel_browser_view.h'],
             ['exclude', '^browser/chromeos/legacy_window_manager/wm_ipc.cc'],
             ['exclude', '^browser/chromeos/legacy_window_manager/wm_message_listener.cc'],
             ['exclude', '^browser/chromeos/login/background_view.cc'],
             ['exclude', '^browser/chromeos/login/screen_locker_browsertest.cc'],
             ['exclude', '^browser/chromeos/login/screen_locker_views.cc'],
             ['exclude', '^browser/chromeos/login/screen_lock_view.cc'],
             ['exclude', '^browser/chromeos/login/shutdown_button.cc'],
             ['exclude', '^browser/chromeos/login/username_view.cc'],
             ['exclude', '^browser/chromeos/login/user_view.cc'],
             ['exclude', '^browser/chromeos/login/views_login_display.cc'],
@@ skipping 99 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }