This restores a hack that was in place in the old NativeTabContentsContainer code that seemed to clear focus during restoration (though the hack was for another purpose, the hack seemed to fix this bug too). I've isolated the hack to the re-activation code.
http://crbug.com/125976
TEST=see bug
Review URL: https://chromiumcodereview.appspot.com/10378043
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=137040
Review URL: https://chromiumcodereview.appspot.com/10378043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137153 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 2a0a121..d36c559 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -6,6 +6,7 @@
'targets': [
{
'target_name': 'ui_test_support',
+ 'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
@@ -15,17 +16,12 @@
'base/test/cocoa_test_event_utils.mm',
'base/test/ui_cocoa_test_helper.h',
'base/test/ui_cocoa_test_helper.mm',
+ 'base/test/dummy_input_method.cc',
+ 'base/test/dummy_input_method.h',
],
'include_dirs': [
'../',
],
- 'conditions': [
- ['OS=="mac"', {
- 'type': 'static_library',
- }, { # OS != "mac"
- 'type': 'none',
- }],
- ],
},
{
'target_name': 'ui_unittests',
