Fixes for -Wunused-function on Linux, Android and ChromeOS

chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.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/ui/aura/chrome_browser_main_extra_parts_aura.h"
 
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/aura/env.h"
@@ skipping 10 matching lines @@
 #if defined(USE_ASH)
 #include "chrome/browser/ui/ash/ash_init.h"
 #if defined(OS_WIN)
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #endif  // defined(OS_WIN)
 #endif  // defined(USE_ASH)
 
 namespace {
 
+#if !defined(OS_CHROMEOS) && defined(USE_ASH)
 // Returns the desktop this process was initially launched in.
 chrome::HostDesktopType GetInitialDesktop() {
 #if defined(OS_WIN) && defined(USE_ASH)
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kViewerConnect) ||
       command_line->HasSwitch(switches::kViewerLaunchViaAppId)) {
     return chrome::HOST_DESKTOP_TYPE_ASH;
   }
 #endif
   return chrome::HOST_DESKTOP_TYPE_NATIVE;
 }
+#endif

[Nico, 2013/11/10 05:07:09]

// !defined(OS_CHROMEOS) && defined(USE_ASH)

[hans, 2013/11/11 19:29:51]

Done.

 
 }  // namespace
 
 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() {
 }
 
 ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() {
 }
 
 void ChromeBrowserMainExtraPartsAura::PreEarlyInitialization() {
@@ skipping 27 matching lines @@
   }
 #endif
 }
 
 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
   active_desktop_monitor_.reset();
 
   // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
   // after the metrics service is deleted.
 }