Remove remainder of USE_ATHENA ifdefs

chrome/browser/renderer_host/pepper/pepper_talk_host.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/renderer_host/pepper/pepper_talk_host.h"
 
 #include "base/bind.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 23 matching lines @@
     int render_frame_id,
     ppapi::host::ReplyMessageContext reply) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   reply.params.set_result(0);
 
   content::RenderFrameHost* render_frame_host =
       content::RenderFrameHost::FromID(render_process_id, render_frame_id);
   if (!render_frame_host)
     return reply;  // RFH destroyed while task was pending.
 
-  // crbug.com/381398, crbug.com/413906 for !USE_ATHENA
-#if defined(USE_ASH) && !defined(USE_ATHENA)
+#if defined(USE_ASH)
   base::string16 title;
   base::string16 message;
 
   switch (permission) {
     case PP_TALKPERMISSION_SCREENCAST:
       title = l10n_util::GetStringUTF16(IDS_GTALK_SCREEN_SHARE_DIALOG_TITLE);
       message =
           l10n_util::GetStringUTF16(IDS_GTALK_SCREEN_SHARE_DIALOG_MESSAGE);
       break;
     case PP_TALKPERMISSION_REMOTING:
@@ skipping 18 matching lines @@
   reply.params.set_result(static_cast<int32_t>(
       chrome::ShowMessageBox(
           parent, title, message, chrome::MESSAGE_BOX_TYPE_QUESTION) ==
       chrome::MESSAGE_BOX_RESULT_YES));
 #else
   NOTIMPLEMENTED();
 #endif
   return reply;
 }
 
-#if defined(USE_ASH) && defined(OS_CHROMEOS) && !defined(USE_ATHENA)
+#if defined(OS_CHROMEOS)

[sky, 2015/01/15 16:28:34]

What about the USE_ASH here and the next two?

[pkotwicz, 2015/01/15 16:44:10]

Am I missing something? Is it possible to compile chromeos without USE_ASH?

The ifdefs seem to have been added in Patch Set 8 here (after the CL was
LGTMed): https://chromiumcodereview.appspot.com/17043006

 void OnTerminateRemotingEventOnUIThread(const base::Closure& stop_callback) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE, stop_callback);
 }
 #endif  // defined(USE_ASH) && defined(OS_CHROMEOS)
 
 ppapi::host::ReplyMessageContext StartRemotingOnUIThread(
     const base::Closure& stop_callback,
     int render_process_id,
     int render_frame_id,
     ppapi::host::ReplyMessageContext reply) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   content::RenderFrameHost* render_frame_host =
       content::RenderFrameHost::FromID(render_process_id, render_frame_id);
   if (!render_frame_host) {
     reply.params.set_result(PP_ERROR_FAILED);
     return reply;  // RFH destroyed while task was pending.
   }
 
-#if defined(USE_ASH) && defined(OS_CHROMEOS) && !defined(USE_ATHENA)
+#if defined(OS_CHROMEOS)
   base::Closure stop_callback_ui_thread =
       base::Bind(&OnTerminateRemotingEventOnUIThread, stop_callback);
 
   ash::Shell::GetInstance()->system_tray_notifier()->NotifyScreenShareStart(
       stop_callback_ui_thread, base::string16());
   reply.params.set_result(PP_OK);
 #else
   NOTIMPLEMENTED();
   reply.params.set_result(PP_ERROR_NOTSUPPORTED);
 #endif
   return reply;
 }
 
 void StopRemotingOnUIThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-#if defined(USE_ASH) && defined(OS_CHROMEOS) && !defined(USE_ATHENA)
+#if defined(OS_CHROMEOS)
   if (ash::Shell::GetInstance()) {
     ash::Shell::GetInstance()->system_tray_notifier()->NotifyScreenShareStop();
   }
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 ppapi::host::ReplyMessageContext StopRemotingOnUIThreadWithResult(
     ppapi::host::ReplyMessageContext reply) {
@@ skipping 118 matching lines @@
 }
 
 void PepperTalkHost::OnStopRemotingCompleted(
     ppapi::host::ReplyMessageContext reply) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   remoting_started_ = false;
   host()->SendReply(reply, PpapiPluginMsg_Talk_StopRemotingReply());
 }
 
 }  // namespace chrome