chrome_exe_main: name os-specific files according to naming pattern

These files probably just predate us having a _win suffix on Windows-specific
code.

BUG=18504
TEST=compiles

Review URL: http://codereview.chromium.org/4451001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65001 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 19 insertions, 18 deletions

diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index a3923b4..9af130e 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -467,11 +467,12 @@ DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
 int ChromeMain(int argc, char** argv) {
 #endif
 #if defined(OS_MACOSX)
-  // TODO(mark): Some of these things ought to be handled in chrome_exe_main.mm.
-  // Under the current architecture, nothing in chrome_exe_main can rely
-  // directly on chrome_dll code on the Mac, though, so until some of this code
-  // is refactored to avoid such a dependency, it lives here.  See also the
-  // TODO(mark) below at InitCrashReporter() and DestructCrashReporter().
+  // TODO(mark): Some of these things ought to be handled in
+  // chrome_exe_main_mac.mm.  Under the current architecture, nothing
+  // in chrome_exe_main can rely directly on chrome_dll code on the
+  // Mac, though, so until some of this code is refactored to avoid
+  // such a dependency, it lives here.  See also the TODO(mark) below
+  // at InitCrashReporter() and DestructCrashReporter().
   base::EnableTerminationOnHeapCorruption();
   base::EnableTerminationOnOutOfMemory();
 #endif  // OS_MACOSX
diff --git a/chrome/app/chrome_exe_main_gtk.cc b/chrome/app/chrome_exe_main_gtk.cc
index f7f8485..35764af 100644
--- a/chrome/app/chrome_exe_main_gtk.cc
+++ b/chrome/app/chrome_exe_main_gtk.cc
@@ -12,9 +12,9 @@
 // order to make it easy to update the app from GoogleUpdate. We don't need
 // that extra layer with on linux.
 //
-// TODO(tc): This is similar to chrome_exe_main.mm.  After it's more clear what
-// needs to go here, we should evaluate whether or not to merge this file with
-// chrome_exe_main.mm.
+// TODO(tc): This is similar to chrome_exe_main_mac.mm.  After it's
+// more clear what needs to go here, we should evaluate whether or not
+// to merge this file with chrome_exe_main_mac.mm.
 
 extern "C" {
 int ChromeMain(int argc, const char** argv);
diff --git a/chrome/app/chrome_exe_main.mm b/chrome/app/chrome_exe_main_mac.mm
index 4f2e474..4f2e474 100644
--- a/chrome/app/chrome_exe_main.mm
+++ b/chrome/app/chrome_exe_main_mac.mm
diff --git a/chrome/app/chrome_exe_main.cc b/chrome/app/chrome_exe_main_win.cc
index 296431c..296431c 100644
--- a/chrome/app/chrome_exe_main.cc
+++ b/chrome/app/chrome_exe_main_win.cc
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 34d5463..f8e17cf 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1216,14 +1216,15 @@
             'infoplist_strings_tool',
           ],
           'sources': [
-            # chrome_exe_main.mm's main() is the entry point for the "chrome"
-            # (browser app) target.  All it does is jump to chrome_dll's
-            # ChromeMain.  This is appropriate for helper processes too,
-            # because the logic to discriminate between process types at run
-            # time is actually directed by the --type command line argument
-            # processed by ChromeMain.  Sharing chrome_exe_main.mm with the
+            # chrome_exe_main_mac.mm's main() is the entry point for
+            # the "chrome" (browser app) target.  All it does is jump
+            # to chrome_dll's ChromeMain.  This is appropriate for
+            # helper processes too, because the logic to discriminate
+            # between process types at run time is actually directed
+            # by the --type command line argument processed by
+            # ChromeMain.  Sharing chrome_exe_main_mac.mm with the
             # browser app will suffice for now.
-            'app/chrome_exe_main.mm',
+            'app/chrome_exe_main_mac.mm',
             'app/helper-Info.plist',
           ],
           # TODO(mark): Come up with a fancier way to do this.  It should only
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 29da686..424ae78 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -15,9 +15,9 @@
           # Test files are not included.
           'app/breakpad_win.cc',
           'app/breakpad_win.h',
-          'app/chrome_exe_main.cc',
-          'app/chrome_exe_main.mm',
           'app/chrome_exe_main_gtk.cc',
+          'app/chrome_exe_main_mac.mm',
+          'app/chrome_exe_main_win.cc',
           'app/chrome_exe_resource.h',
           'app/client_util.cc',
           'app/client_util.h',
@@ -126,7 +126,6 @@
             ],
           }, {  # 'OS!="win"
             'sources!': [
-              'app/chrome_exe_main.cc',
               'app/client_util.cc',
             ]
           }],