17 files changed, 903 insertions, 597 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index a5dffcd..79b1759 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -191,6 +191,7 @@ input_files = [
 

 libs = [

     'browser/browser.lib',

+    'browser/browser_views.lib',

     'browser/debugger/debugger.lib',

     'common/common.lib',

     'installer/util/util.lib',

@@ -403,6 +404,7 @@ sconscript_files = [
     'app/resources/SConscript',

     'app/theme/SConscript',

     'browser/SConscript',

+    'browser/views/SConscript',

     'common/SConscript',

     'installer/mini_installer/SConscript',

     'installer/setup/SConscript',

diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests
index 96e4039..d85210b 100644
--- a/chrome/SConscript.automated_ui_tests
+++ b/chrome/SConscript.automated_ui_tests
@@ -90,6 +90,7 @@ env_test.Prepend(
 libs = [

     'common/common.lib',

     'browser/browser.lib',

+    'browser/browser_views.lib',

     'test/automation/automation.lib',

 ]

 

diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests
index dc98e98..6933d89 100644
--- a/chrome/SConscript.ui_tests
+++ b/chrome/SConscript.ui_tests
@@ -103,6 +103,7 @@ libs = [
     'test/security_tests/security_tests.lib',

     'common/common.lib',

     'browser/browser.lib',

+    'browser/browser_views.lib',

     'test/automation/automation.lib',

 ]

 

diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript
index a944a78..69f1ad4 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/SConscript
@@ -305,71 +305,6 @@ input_files = [
     'user_data_dir_dialog.cc',

     'user_metrics.cc',

     'view_source_contents.cc',

-    'views/about_chrome_view.cc',

-    'views/bookmark_bar_view.cc',

-    'views/bookmark_bubble_view.cc',

-    'views/bookmark_editor_view.cc',

-    'views/bug_report_view.cc',

-    'views/clear_browsing_data.cc',

-    'views/constrained_window_animation.cc',

-    'views/constrained_window_impl.cc',

-    'views/delay_view.cc',

-    'views/download_item_view.cc',

-    'views/download_shelf_view.cc',

-    'views/download_started_animation.cc',

-    'views/edit_keyword_controller.cc',

-    'views/event_utils.cc',

-    'views/first_run_bubble.cc',

-    'views/first_run_customize_view.cc',

-    'views/first_run_view.cc',

-    'views/first_run_view_base.cc',

-    'views/frame/aero_glass_frame.cc',

-    'views/frame/aero_glass_non_client_view.cc',

-    'views/frame/browser_view.cc',

-    'views/frame/browser_view2.cc',

-    'views/frame/browser_window_factory.cc',

-    'views/frame/opaque_frame.cc',

-    'views/frame/opaque_non_client_view.cc',

-    'views/go_button.cc',

-    'views/html_dialog_view.cc',

-    'views/hung_renderer_view.cc',

-    'views/hwnd_html_view.cc',

-    'views/importer_lock_view.cc',

-    'views/importer_view.cc',

-    'views/importing_progress_view.cc',

-    'views/info_bar_alternate_nav_url_view.cc',

-    'views/info_bar_confirm_view.cc',

-    'views/info_bar_item_view.cc',

-    'views/info_bar_message_view.cc',

-    'views/info_bar_view.cc',

-    'views/info_bubble.cc',

-    'views/input_window.cc',

-    'views/keyword_editor_view.cc',

-    'views/location_bar_view.cc',

-    'views/login_view.cc',

-    'views/options/advanced_contents_view.cc',

-    'views/options/advanced_page_view.cc',

-    'views/options/content_page_view.cc',

-    'views/options/cookies_view.cc',

-    'views/options/fonts_languages_window_view.cc',

-    'views/options/fonts_page_view.cc',

-    'views/options/general_page_view.cc',

-    'views/options/language_combobox_model.cc',

-    'views/options/languages_page_view.cc',

-    'views/options/options_group_view.cc',

-    'views/options/options_page_view.cc',

-    'views/options/options_window_view.cc',

-    'views/password_manager_view.cc',

-    'views/restart_message_box.cc',

-    'views/sad_tab_view.cc',

-    'views/shelf_item_dialog.cc',

-    'views/shell_dialogs.cc',

-    'views/star_toggle.cc',

-    'views/status_bubble.cc',

-    'views/tab_icon_view.cc',

-    'views/theme_helpers.cc',

-    'views/toolbar_star_toggle.cc',

-    'views/toolbar_view.cc',

     'visitedlink_master.cc',

     'vista_frame.cc',

     'web_app.cc',

diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 5598daf..1669c46 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -1235,538 +1235,6 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Views (Browser Window)"
-			>
-			<File
-				RelativePath=".\views\about_chrome_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\about_chrome_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\bookmark_bar_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\bookmark_bar_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\bookmark_bubble_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\bookmark_bubble_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\bookmark_editor_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\bookmark_editor_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\bug_report_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\bug_report_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\clear_browsing_data.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\clear_browsing_data.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\constrained_window_animation.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\constrained_window_animation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\constrained_window_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\constrained_window_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\delay_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\delay_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\dom_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\download_item_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\download_item_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\download_shelf_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\download_shelf_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\download_started_animation.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\download_started_animation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\edit_keyword_controller.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\edit_keyword_controller.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\event_utils.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\event_utils.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\event_utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\event_utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\external_protocol_dialog.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\external_protocol_dialog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\first_run_bubble.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\first_run_bubble.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\first_run_customize_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\first_run_customize_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\first_run_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\first_run_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\first_run_view_base.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\first_run_view_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\go_button.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\go_button.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\hung_renderer_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\hung_renderer_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\hwnd_html_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\hwnd_html_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\importer_lock_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\importer_lock_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\importer_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\importer_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\importing_progress_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\importing_progress_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\info_bubble.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\info_bubble.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\input_window.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\input_window.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\keyword_editor_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\keyword_editor_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\location_bar_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\location_bar_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\login_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\login_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\password_manager_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\password_manager_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\sad_tab_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\sad_tab_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\shelf_item_dialog.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\shelf_item_dialog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\shell_dialogs.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\star_toggle.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\star_toggle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\status_bubble.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\status_bubble.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\theme_helpers.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\theme_helpers.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\toolbar_star_toggle.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\toolbar_star_toggle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\views\toolbar_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\views\toolbar_view.h"
-				>
-			</File>
-			<Filter
-				Name="Info Bars"
-				>
-				<File
-					RelativePath=".\views\info_bar_alternate_nav_url_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\info_bar_alternate_nav_url_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\info_bar_confirm_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\info_bar_confirm_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\info_bar_item_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\info_bar_item_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\info_bar_message_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\info_bar_message_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\info_bar_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\info_bar_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\tab_icon_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\tab_icon_view.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Options"
-				>
-				<File
-					RelativePath=".\views\options\advanced_contents_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\advanced_contents_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\advanced_page_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\advanced_page_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\content_page_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\content_page_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\cookies_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\cookies_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\fonts_languages_window_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\fonts_languages_window_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\fonts_page_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\fonts_page_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\general_page_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\general_page_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\language_combobox_model.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\language_combobox_model.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\languages_page_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\languages_page_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\options_group_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\options_group_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\options_page_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\options_page_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\options\options_window_view.cc"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Frame"
-				>
-				<File
-					RelativePath=".\views\frame\aero_glass_frame.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\aero_glass_frame.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\aero_glass_non_client_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\aero_glass_non_client_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\browser_frame.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\browser_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\browser_view.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\browser_view2.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\browser_view2.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\browser_window_factory.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\opaque_frame.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\opaque_frame.h"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\opaque_non_client_view.cc"
-					>
-				</File>
-				<File
-					RelativePath=".\views\frame\opaque_non_client_view.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
 			Name="Destination"
 			>
 			<File
@@ -2655,6 +2123,14 @@
 			>
 		</File>
 		<File
+			RelativePath=".\external_protocol_dialog.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\external_protocol_dialog.h"
+			>
+		</File>
+		<File
 			RelativePath=".\external_protocol_handler.cc"
 			>
 		</File>
diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript
new file mode 100644
index 0000000..20ca3dd
--- /dev/null
+++ b/chrome/browser/views/SConscript
@@ -0,0 +1,149 @@
+# Copyright 2008, Google Inc.

+# All rights reserved.

+#

+# Redistribution and use in source and binary forms, with or without

+# modification, are permitted provided that the following conditions are

+# met:

+#

+#    * Redistributions of source code must retain the above copyright

+# notice, this list of conditions and the following disclaimer.

+#    * Redistributions in binary form must reproduce the above

+# copyright notice, this list of conditions and the following disclaimer

+# in the documentation and/or other materials provided with the

+# distribution.

+#    * Neither the name of Google Inc. nor the names of its

+# contributors may be used to endorse or promote products derived from

+# this software without specific prior written permission.

+#

+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+Import('env')

+

+env = env.Clone()

+

+

+env.Prepend(

+    CPPPATH = [

+        '$CHROME_DIR/app/resources',

+        #'$OBJ_ROOT/google_update',

+        '#/tools/build/win',

+        '#/..',

+    ],

+    CPPDEFINES = [

+        'U_STATIC_IMPLEMENTATION',

+        'USE_HUNSPELL',

+        'HUNSPELL_CHROME_CLIENT',

+        'LIBXML_STATIC',

+        'PNG_USER_CONFIG',

+        'CHROME_PNG_WRITE_SUPPORT',

+    ],

+    CCFLAGS = [

+        '/TP',

+    ],

+)

+

+env.Append(

+    CPPPATH = [

+        '$GTEST_DIR/include',

+

+        '$GOOGLE_UPDATE_DIR',

+        '$CHROME_DIR/third_party/hunspell/src/hunspell',

+        '$CHROME_DIR/third_party/wtl/include',

+        '$NPAPI_DIR',

+        '$LIBXML_DIR/scons/include',

+        '$LIBXML_DIR/include',

+        '$ICU38_DIR/public/common',

+        '$ICU38_DIR/public/i18n',

+        '$CHROME_DIR/app',

+        '$WEBKIT_DIR/build/localized_strings',

+        '$ZLIB_DIR',

+        '$SKIA_DIR/include',

+        '$SKIA_DIR/include/corecg',

+        '$SKIA_DIR/platform',

+        '$LIBPNG_DIR',

+        '$BREAKPAD_DIR/src',

+    ],

+)

+

+input_files = [

+    'about_chrome_view.cc',

+    'bookmark_bar_view.cc',

+    'bookmark_bubble_view.cc',

+    'bookmark_editor_view.cc',

+    'bug_report_view.cc',

+    'clear_browsing_data.cc',

+    'constrained_window_animation.cc',

+    'constrained_window_impl.cc',

+    'delay_view.cc',

+    'download_item_view.cc',

+    'download_shelf_view.cc',

+    'download_started_animation.cc',

+    'edit_keyword_controller.cc',

+    'event_utils.cc',

+    'first_run_bubble.cc',

+    'first_run_customize_view.cc',

+    'first_run_view.cc',

+    'first_run_view_base.cc',

+    'frame/aero_glass_frame.cc',

+    'frame/aero_glass_non_client_view.cc',

+    'frame/browser_view.cc',

+    'frame/browser_view2.cc',

+    'frame/browser_window_factory.cc',

+    'frame/opaque_frame.cc',

+    'frame/opaque_non_client_view.cc',

+    'go_button.cc',

+    'html_dialog_view.cc',

+    'hung_renderer_view.cc',

+    'hwnd_html_view.cc',

+    'importer_lock_view.cc',

+    'importer_view.cc',

+    'importing_progress_view.cc',

+    'info_bar_alternate_nav_url_view.cc',

+    'info_bar_confirm_view.cc',

+    'info_bar_item_view.cc',

+    'info_bar_message_view.cc',

+    'info_bar_view.cc',

+    'info_bubble.cc',

+    'input_window.cc',

+    'keyword_editor_view.cc',

+    'location_bar_view.cc',

+    'login_view.cc',

+    'options/advanced_contents_view.cc',

+    'options/advanced_page_view.cc',

+    'options/content_page_view.cc',

+    'options/cookies_view.cc',

+    'options/fonts_languages_window_view.cc',

+    'options/fonts_page_view.cc',

+    'options/general_page_view.cc',

+    'options/language_combobox_model.cc',

+    'options/languages_page_view.cc',

+    'options/options_group_view.cc',

+    'options/options_page_view.cc',

+    'options/options_window_view.cc',

+    'password_manager_view.cc',

+    'restart_message_box.cc',

+    'sad_tab_view.cc',

+    'shelf_item_dialog.cc',

+    'shell_dialogs.cc',

+    'star_toggle.cc',

+    'status_bubble.cc',

+    'tab_icon_view.cc',

+    'theme_helpers.cc',

+    'toolbar_star_toggle.cc',

+    'toolbar_view.cc',

+]

+

+env.ChromeStaticLibrary('browser_views', input_files)

+

+

+SConscript('debugger/SConscript', exports=['env'])

diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj
new file mode 100644
index 0000000..b63141e
--- /dev/null
+++ b/chrome/browser/views/browser_views.vcproj
@@ -0,0 +1,671 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="browser_views"
+	ProjectGUID="{FA537565-7B03-4FFC-AF15-F7A979B72E22}"
+	RootNamespace="Browser_views"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\browser.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\tools\build\win\precompiled_wtl.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\browser.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)\tools\build\win\js_engine.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Frame"
+			>
+			<File
+				RelativePath=".\frame\aero_glass_frame.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\aero_glass_frame.h"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\aero_glass_non_client_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\aero_glass_non_client_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\browser_frame.h"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\browser_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\browser_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\browser_view2.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\browser_view2.h"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\browser_window_factory.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\opaque_frame.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\opaque_frame.h"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\opaque_non_client_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\frame\opaque_non_client_view.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Info Bars"
+			>
+			<File
+				RelativePath=".\info_bar_alternate_nav_url_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\info_bar_alternate_nav_url_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\info_bar_confirm_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\info_bar_confirm_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\info_bar_item_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\info_bar_item_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\info_bar_message_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\info_bar_message_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\info_bar_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\info_bar_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_icon_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_icon_view.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Options"
+			>
+			<File
+				RelativePath=".\options\advanced_contents_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\advanced_contents_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\advanced_page_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\advanced_page_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\content_page_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\content_page_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\cookies_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\cookies_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\fonts_languages_window_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\fonts_languages_window_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\fonts_page_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\fonts_page_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\general_page_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\general_page_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\language_combobox_model.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\language_combobox_model.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\languages_page_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\languages_page_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\options_group_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\options_group_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\options_page_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\options\options_page_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\options\options_window_view.cc"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\about_chrome_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\about_chrome_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\bookmark_bar_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\bookmark_bar_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\bookmark_bubble_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\bookmark_bubble_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\bookmark_editor_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\bookmark_editor_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\bug_report_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\bug_report_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\clear_browsing_data.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\clear_browsing_data.h"
+			>
+		</File>
+		<File
+			RelativePath=".\constrained_window_animation.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\constrained_window_animation.h"
+			>
+		</File>
+		<File
+			RelativePath=".\constrained_window_impl.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\constrained_window_impl.h"
+			>
+		</File>
+		<File
+			RelativePath=".\delay_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\delay_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\dom_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\download_item_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\download_item_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\download_shelf_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\download_shelf_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\download_started_animation.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\download_started_animation.h"
+			>
+		</File>
+		<File
+			RelativePath=".\edit_keyword_controller.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\edit_keyword_controller.h"
+			>
+		</File>
+		<File
+			RelativePath=".\event_utils.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\event_utils.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\event_utils.h"
+			>
+		</File>
+		<File
+			RelativePath=".\event_utils.h"
+			>
+		</File>
+		<File
+			RelativePath=".\first_run_bubble.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\first_run_bubble.h"
+			>
+		</File>
+		<File
+			RelativePath=".\first_run_customize_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\first_run_customize_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\first_run_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\first_run_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\first_run_view_base.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\first_run_view_base.h"
+			>
+		</File>
+		<File
+			RelativePath=".\go_button.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\go_button.h"
+			>
+		</File>
+		<File
+			RelativePath=".\hung_renderer_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\hung_renderer_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\hwnd_html_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\hwnd_html_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\importer_lock_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\importer_lock_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\importer_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\importer_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\importing_progress_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\importing_progress_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\info_bubble.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\info_bubble.h"
+			>
+		</File>
+		<File
+			RelativePath=".\input_window.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\input_window.h"
+			>
+		</File>
+		<File
+			RelativePath=".\keyword_editor_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\keyword_editor_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\location_bar_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\location_bar_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\login_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\login_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\password_manager_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\password_manager_view.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\tools\build\win\precompiled_wtl.cc"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\tools\build\win\precompiled_wtl.h"
+			>
+		</File>
+		<File
+			RelativePath=".\sad_tab_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\sad_tab_view.h"
+			>
+		</File>
+		<File
+			RelativePath=".\shelf_item_dialog.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\shelf_item_dialog.h"
+			>
+		</File>
+		<File
+			RelativePath=".\shell_dialogs.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\star_toggle.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\star_toggle.h"
+			>
+		</File>
+		<File
+			RelativePath=".\status_bubble.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\status_bubble.h"
+			>
+		</File>
+		<File
+			RelativePath=".\theme_helpers.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\theme_helpers.h"
+			>
+		</File>
+		<File
+			RelativePath=".\toolbar_star_toggle.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\toolbar_star_toggle.h"
+			>
+		</File>
+		<File
+			RelativePath=".\toolbar_view.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\toolbar_view.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 0f5e42c..334ceef 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -162,6 +162,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dl
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 	EndProjectSection
 EndProject
@@ -244,6 +245,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perf_tests", "test\perf\per
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 	EndProjectSection
 EndProject
@@ -283,6 +285,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "test\unit\uni
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
 	EndProjectSection
@@ -305,6 +308,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "page_cycler_tests", "test\p
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reliability_tests", "test\reliability\reliability_tests.vcproj", "{8A3E1774-1DE9-445C-982D-3EE37C8A752A}"
@@ -321,6 +325,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reliability_tests", "test\r
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "selenium_tests", "test\selenium\selenium_tests.vcproj", "{E3749617-BA3D-4230-B54C-B758E56D9FA5}"
@@ -339,6 +344,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "selenium_tests", "test\sele
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "startup_tests", "test\startup\startup_tests.vcproj", "{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}"
@@ -355,6 +361,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "startup_tests", "test\start
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_tests", "test\ui\ui_tests.vcproj", "{76235B67-1C27-4627-8A33-4B2E1EF93EDE}"
@@ -382,6 +389,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_tests", "test\ui\ui_test
 		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox", "..\sandbox\src\sandbox.vcproj", "{881F6A97-D539-4C48-B401-DF04385B2343}"
@@ -419,6 +427,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_profile", "tools\p
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 	EndProjectSection
 EndProject
@@ -568,6 +577,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tests", "test\plugin
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "test\interactive_ui\interactive_ui.vcproj", "{018D4F38-6272-448F-A864-976DA09F05D0}"
@@ -587,6 +597,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "tes
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}"
@@ -739,6 +750,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automated_ui_tests", "test\
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer_test", "test\mini_installer_test\mini_installer_test.vcproj", "{4B6E199A-034A-49BD-AB93-458DD37E45B1}"
@@ -1022,6 +1034,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tab_switching_test", "test\
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util_prebuild", "installer\util\prebuild\util_prebuild.vcproj", "{0026A376-C4F1-4575-A1BA-578C69F07013}"
@@ -1052,6 +1065,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memory_test", "test\memory_
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_base", "..\v8\tools\visual_studio\v8_base.vcproj", "{EC8B7909-62AF-470D-A75D-E1D89C837142}"
@@ -1077,6 +1091,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_shell", "..\v8\tools\vis
 		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\views\browser_views.vcproj", "{FA537565-7B03-4FFC-AF15-F7A979B72E22}"
+	ProjectSection(ProjectDependencies) = postProject
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2415,6 +2436,16 @@ Global
 		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.ActiveCfg = Release|Win32
 		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.Build.0 = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.Build.0 = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Any CPU.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.Build.0 = Release|Win32
 		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -2589,6 +2620,7 @@ Global
 		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {032541FB-1E7C-4423-B657-4A71FE180C8A}
 		{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {B6867423-23BD-4588-9321-2D500F128A3D}
diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln
index d6ababf..a3dc7fd 100644
--- a/chrome/chrome_kjs.sln
+++ b/chrome/chrome_kjs.sln
@@ -164,6 +164,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dl
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 	EndProjectSection
 EndProject
@@ -248,6 +249,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perf_tests", "test\perf\per
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 	EndProjectSection
 EndProject
@@ -287,6 +289,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "test\unit\uni
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
 	EndProjectSection
@@ -309,6 +312,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "page_cycler_tests", "test\p
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reliability_tests", "test\reliability\reliability_tests.vcproj", "{8A3E1774-1DE9-445C-982D-3EE37C8A752A}"
@@ -325,6 +329,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reliability_tests", "test\r
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "selenium_tests", "test\selenium\selenium_tests.vcproj", "{E3749617-BA3D-4230-B54C-B758E56D9FA5}"
@@ -343,6 +348,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "selenium_tests", "test\sele
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "startup_tests", "test\startup\startup_tests.vcproj", "{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}"
@@ -359,6 +365,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "startup_tests", "test\start
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_tests", "test\ui\ui_tests.vcproj", "{76235B67-1C27-4627-8A33-4B2E1EF93EDE}"
@@ -386,6 +393,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_tests", "test\ui\ui_test
 		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox", "..\sandbox\src\sandbox.vcproj", "{881F6A97-D539-4C48-B401-DF04385B2343}"
@@ -423,6 +431,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_profile", "tools\p
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 	EndProjectSection
 EndProject
@@ -572,6 +581,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tests", "test\plugin
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "test\interactive_ui\interactive_ui.vcproj", "{018D4F38-6272-448F-A864-976DA09F05D0}"
@@ -591,6 +601,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "tes
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}"
@@ -741,6 +752,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automated_ui_tests", "test\
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer_test", "test\mini_installer_test\mini_installer_test.vcproj", "{4B6E199A-034A-49BD-AB93-458DD37E45B1}"
@@ -1019,6 +1031,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tab_switching_test", "test\
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util_prebuild", "installer\util\prebuild\util_prebuild.vcproj", "{0026A376-C4F1-4575-A1BA-578C69F07013}"
@@ -1027,6 +1040,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\testing\gtest.v
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debugger_disabled", "browser\debugger\debugger_disabled.vcproj", "{369B9881-3F2C-464D-A96C-E281405DF8F6}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\views\browser_views.vcproj", "{FA537565-7B03-4FFC-AF15-F7A979B72E22}"
+	ProjectSection(ProjectDependencies) = postProject
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2306,6 +2326,16 @@ Global
 		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.ActiveCfg = Release|Win32
 		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.Build.0 = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.Build.0 = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Any CPU.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.Build.0 = Release|Win32
 		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -2473,6 +2503,7 @@ Global
 		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {BBD3C9B1-AC02-41F4-AB89-D01B70009795}
 		{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {2A3885E6-15C7-4B66-88FF-5D05058B27A0}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {B6867423-23BD-4588-9321-2D500F128A3D}
diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index 8b222a2..113291f 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -55,6 +55,7 @@ env_test.Prepend(
         'base',

         'base_gfx',

         'browser',

+        'browser_views',

         'bzip2',

         'common',

         'googleurl',

diff --git a/chrome/test/memory_test/SConscript b/chrome/test/memory_test/SConscript
index 348b752..7e113cd 100644
--- a/chrome/test/memory_test/SConscript
+++ b/chrome/test/memory_test/SConscript
@@ -50,6 +50,7 @@ env_test.Prepend(
         'base',

         'base_gfx',

         'browser',

+        'browser_views',

         'common',

         'googleurl',

         'gtest',

diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript
index 86fbdbf..a21feaa 100644
--- a/chrome/test/page_cycler/SConscript
+++ b/chrome/test/page_cycler/SConscript
@@ -56,6 +56,7 @@ env_test.Prepend(
         'zlib',

         'modp_b64',

         'browser',

+        'browser_views',

         'net',

         'base',

         'automation',

diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript
index 5cd5202..806b5b8 100644
--- a/chrome/test/plugin/SConscript
+++ b/chrome/test/plugin/SConscript
@@ -61,6 +61,7 @@ env_test.Prepend(
         'zlib',

         'modp_b64',

         'browser',

+        'browser_views',

         'net',

         'base',

         'automation',

diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript
index 0963288..deb2b50 100644
--- a/chrome/test/reliability/SConscript
+++ b/chrome/test/reliability/SConscript
@@ -56,6 +56,7 @@ env_test.Prepend(
         'common',

         'zlib',

         'browser',

+        'browser_views',

         'base',

         'automation',

     ],

diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript
index c00c570..31785a1 100644
--- a/chrome/test/selenium/SConscript
+++ b/chrome/test/selenium/SConscript
@@ -55,6 +55,7 @@ env_test.Prepend(
         'zlib',

         'modp_b64',

         'browser',

+        'browser_views',

         'net',

         'base',

         'automation',

diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
index 7815551..4cce677 100644
--- a/chrome/test/startup/SConscript
+++ b/chrome/test/startup/SConscript
@@ -54,6 +54,7 @@ env_test.Prepend(
         'common',

         'zlib',

         'browser',

+        'browser_views',

         'base',

         'automation',

     ],

diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript
index 420583f..d5fc7e7 100644
--- a/chrome/test/tab_switching/SConscript
+++ b/chrome/test/tab_switching/SConscript
@@ -55,6 +55,7 @@ env_test.Prepend(
         'zlib',

         'modp_b64',

         'browser',

+        'browser_views',

         'net',

         'base',

         'automation',