summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-02 06:53:31 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-02 06:53:31 +0000
commit8b03e8d6baf5f5e6432486435d2974b54b12c9d6 (patch)
tree959ae24e14029041acac9511ae19e8f2df100ab2 /chrome
parentbfa24b961a7095fe532125dcbfc123dbb3988240 (diff)
downloadchromium_src-8b03e8d6baf5f5e6432486435d2974b54b12c9d6.zip
chromium_src-8b03e8d6baf5f5e6432486435d2974b54b12c9d6.tar.gz
chromium_src-8b03e8d6baf5f5e6432486435d2974b54b12c9d6.tar.bz2
Add missing tests to the GYP+Xcode build.
Review URL: http://codereview.chromium.org/28309 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/nibs/en.lproj/BrowserWindow.xib (renamed from chrome/app/nibs/English.lproj/BrowserWindow.xib)0
-rw-r--r--chrome/app/nibs/en.lproj/MainMenu.xib (renamed from chrome/app/nibs/English.lproj/MainMenu.xib)0
-rw-r--r--chrome/app/nibs/en.lproj/TabContents.xib (renamed from chrome/app/nibs/English.lproj/TabContents.xib)0
-rw-r--r--chrome/chrome.gyp10
4 files changed, 4 insertions, 6 deletions
diff --git a/chrome/app/nibs/English.lproj/BrowserWindow.xib b/chrome/app/nibs/en.lproj/BrowserWindow.xib
index 42a88a2..42a88a2 100644
--- a/chrome/app/nibs/English.lproj/BrowserWindow.xib
+++ b/chrome/app/nibs/en.lproj/BrowserWindow.xib
diff --git a/chrome/app/nibs/English.lproj/MainMenu.xib b/chrome/app/nibs/en.lproj/MainMenu.xib
index e191c9a..e191c9a 100644
--- a/chrome/app/nibs/English.lproj/MainMenu.xib
+++ b/chrome/app/nibs/en.lproj/MainMenu.xib
diff --git a/chrome/app/nibs/English.lproj/TabContents.xib b/chrome/app/nibs/en.lproj/TabContents.xib
index 217660b..217660b 100644
--- a/chrome/app/nibs/English.lproj/TabContents.xib
+++ b/chrome/app/nibs/en.lproj/TabContents.xib
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 308a782..81aa3c4 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1334,9 +1334,9 @@
'app/scoped_ole_initializer.h',
],
'mac_bundle_resources': [
- 'app/nibs/English.lproj/BrowserWindow.xib',
- 'app/nibs/English.lproj/MainMenu.xib',
- 'app/nibs/English.lproj/TabContents.xib',
+ 'app/nibs/en.lproj/BrowserWindow.xib',
+ 'app/nibs/en.lproj/MainMenu.xib',
+ 'app/nibs/en.lproj/TabContents.xib',
'app/theme/chromium/chromium.icns',
'app/theme/back.pdf',
'app/theme/forward.pdf',
@@ -1423,7 +1423,7 @@
'conditions': [
['OS=="mac"', {
'outputs': [
- '<(INTERMEDIATE_DIR)/repack/English.lproj/locale.pak',
+ '<(INTERMEDIATE_DIR)/repack/en.lproj/locale.pak',
],
}, { # else: OS!="mac"
'outputs': [
@@ -1705,7 +1705,6 @@
'browser/download/download_request_manager_unittest.cc',
'browser/extensions/user_script_master_unittest.cc',
'browser/history/text_database_manager_unittest.cc',
- 'browser/history/text_database_unittest.cc',
'browser/history/thumbnail_database_unittest.cc',
'browser/importer/firefox_importer_unittest.cc',
'browser/importer/importer_unittest.cc',
@@ -1737,7 +1736,6 @@
'browser/visitedlink_unittest.cc',
'browser/webdata/web_database_unittest.cc',
'browser/window_sizer_unittest.cc',
- 'common/gfx/chrome_font_unittest.cc',
'common/gfx/emf_unittest.cc',
'common/gfx/icon_util_unittest.cc',
'common/gfx/text_elider_unittest.cc',