Add support for calculating the position of the top controls in the cc layer.

content/browser/renderer_host/render_process_host_impl.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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 828 matching lines @@
     cc::switches::kEnableImplSidePainting,
     cc::switches::kEnablePartialSwap,
     cc::switches::kNumRasterThreads,
     cc::switches::kShowPropertyChangedRects,
     cc::switches::kShowSurfaceDamageRects,
     cc::switches::kShowScreenSpaceRects,
     cc::switches::kShowReplicaScreenSpaceRects,
     cc::switches::kShowNonOccludingRects,
     cc::switches::kShowOccludingRects,
     cc::switches::kTraceOverdraw,
+    cc::switches::kTopControlsHeight,
   };
   renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
                                  arraysize(kSwitchNames));
 
   // Disable databases in incognito mode.
   if (GetBrowserContext()->IsOffTheRecord() &&
       !browser_cmd.HasSwitch(switches::kDisableDatabases)) {
     renderer_cmd->AppendSwitch(switches::kDisableDatabases);
 #if defined(OS_ANDROID)
     renderer_cmd->AppendSwitch(switches::kDisableMediaHistoryLogging);
 #endif
   }
+
+#if defined(OS_ANDROID)

[aelias_OOO_until_Jul13, 2012/12/19 08:31:18]

I don't think we should have this block here.  Please move this code to
content/browser/android/content_startup_flags.cc

[Ted C, 2012/12/19 21:34:17]

I only want to enable this in the renderer.  content_startup_flags doesn't seem
to distinguish between the browser and renderer command lines.

[aelias_OOO_until_Jul13, 2012/12/19 23:08:36]

You can set it explicitly to false in the browser compositor in our Compositor
class.  That's how ChromeOS deals with browser/renderer setting differences.

[Ted C, 2012/12/20 00:42:38]

Done

+  if (!browser_cmd.HasSwitch(switches::kDisableFullScreen)) {
+    renderer_cmd->AppendSwitch(
+        cc::switches::kEnableTopControlsPositionCalculation);
+  }
+#endif
 }
 
 base::ProcessHandle RenderProcessHostImpl::GetHandle() {
   if (run_renderer_in_process())
     return base::Process::Current().handle();
 
   if (!child_process_launcher_.get() || child_process_launcher_->IsStarting())
     return base::kNullProcessHandle;
 
   return child_process_launcher_->GetHandle();
@@ skipping 723 matching lines @@
                "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.surface_handle = surface_handle;
   ack_params.sync_point = 0;
   RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
                                                  gpu_process_host_id,
                                                  ack_params);
 }
 
 }  // namespace content