Make chrome/browser/chrome_browser_main_linux.* Linux-only.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 84 matching lines @@
 
 #if defined(OS_WIN)
 #include "chrome/browser/chrome_browser_main_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_main_mac.h"
 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_mac.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)

[Lei Zhang, 2012/03/22 23:02:20]

Robert Nagt: I'm going to "do the right thing" and move this into the POSIX
implementation. I hope you are making progress in not include _linux files in
the OpenBSD build.

[Lei Zhang, 2012/03/22 23:03:37]

s/Nagt/Nagy/. 

+#elif defined(OS_LINUX)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_POSIX)
 #include "chrome/browser/chrome_browser_main_posix.h"
 #endif
 
 #if defined(USE_AURA)
 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_aura.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_win.h"
 #endif
@@ skipping 200 matching lines @@
 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams& parameters) {
   ChromeBrowserMainParts* main_parts;
   // Construct the Main browser parts based on the OS type.
 #if defined(OS_WIN)
   main_parts = new ChromeBrowserMainPartsWin(parameters);
 #elif defined(OS_MACOSX)
   main_parts = new ChromeBrowserMainPartsMac(parameters);
 #elif defined(OS_CHROMEOS)
   main_parts = new ChromeBrowserMainPartsChromeos(parameters);
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX)
   main_parts = new ChromeBrowserMainPartsLinux(parameters);
 #elif defined(OS_ANDROID)
   // Do nothing for Android.
   // TODO(klobag): Android initialization should use the
   // *BrowserMainParts class-hierarchy for setting up custom initialization.
   main_parts = NULL;
 #elif defined(OS_POSIX)
   main_parts = new ChromeBrowserMainPartsPosix(parameters);
 #else
   NOTREACHED();
@@ skipping 1295 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome