Cleanup: USE_X11 + OS_MACOSX = OS_POSIX.

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2206 matching lines @@
 
 bool RenderView::isSelectTrailingWhitespaceEnabled() {
 #if defined(OS_WIN)
   return true;
 #else
   return false;
 #endif
 }
 
 void RenderView::didChangeSelection(bool is_empty_selection) {
-#if defined(USE_X11) || defined(OS_MACOSX)
+#if defined(OS_POSIX)
   if (!handling_input_event_)
       return;
   // TODO(estade): investigate incremental updates to the selection so that we
   // don't send the entire selection over IPC every time.
   if (!is_empty_selection) {
     // Sometimes we get repeated didChangeSelection calls from webkit when
     // the selection hasn't actually changed. We don't want to report these
     // because it will cause us to continually claim the X clipboard.
     const std::string& this_selection =
         webview()->focusedFrame()->selectionAsText().utf8();
     if (this_selection == last_selection_)
       return;
 
     Send(new ViewHostMsg_SelectionChanged(routing_id_,
          this_selection));
     last_selection_ = this_selection;
   } else {
     last_selection_.clear();
     Send(new ViewHostMsg_SelectionChanged(routing_id_,
          last_selection_));
   }
-#endif
+#endif  // defined(OS_POSIX)
 }
 
 void RenderView::didExecuteCommand(const WebString& command_name) {
   const std::string& name = UTF16ToUTF8(command_name);
   if (StartsWithASCII(name, "Move", true) ||
       StartsWithASCII(name, "Insert", true) ||
       StartsWithASCII(name, "Delete", true))
     return;
   UserMetricsRecordAction(name);
 }
@@ skipping 3357 matching lines @@
 void RenderView::OnPageTranslated() {
   WebFrame* frame = webview()->mainFrame();
   if (!frame)
     return;
 
   // The page is translated, so try to extract the form data again.
   autofill_helper_->FrameContentsAvailable(frame);
 }
 
 #if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-WebKit::WebGeolocationClient* RenderView::geolocationClient()
-{
+WebKit::WebGeolocationClient* RenderView::geolocationClient() {
   if (!geolocation_dispatcher_.get())
     geolocation_dispatcher_.reset(new GeolocationDispatcher(this));
   return geolocation_dispatcher_.get();
 }
 #else
 WebKit::WebGeolocationService* RenderView::geolocationService() {
   if (!geolocation_dispatcher_.get())
     geolocation_dispatcher_.reset(new GeolocationDispatcherOld(this));
   return geolocation_dispatcher_.get();
 }
@@ skipping 107 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }