[MediaRouter] Adds GetPresentationServiceDelegate impl to ChromeContentBrowserClient

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 222 matching lines @@
 #endif
 
 #if defined(ENABLE_SPELLCHECK)
 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
 #endif
 
 #if defined(ENABLE_WEBRTC)
 #include "chrome/browser/media/webrtc_logging_handler_host.h"
 #endif
 
+#if defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/media/router/presentation_service_delegate_impl.h"
+#endif
+
 using base::FileDescriptor;
 using blink::WebWindowFeatures;
 using content::AccessTokenStore;
 using content::BrowserThread;
 using content::BrowserURLHandler;
 using content::ChildProcessSecurityPolicy;
 using content::QuotaPermissionContext;
 using content::RenderFrameHost;
 using content::RenderViewHost;
 using content::ResourceType;
@@ skipping 2101 matching lines @@
   Navigate(&nav_params);
   callback.Run(nav_params.target_contents);
 #elif defined(OS_ANDROID)
   service_tab_launcher::ServiceTabLauncher::GetInstance()->LaunchTab(
       browser_context, params, callback);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
+content::PresentationServiceDelegate*
+ChromeContentBrowserClient::GetPresentationServiceDelegate(
+      content::WebContents* web_contents) {
+#if defined(ENABLE_MEDIA_ROUTER)
+  if (switches::MediaRouterEnabled()) {
+    return media_router::PresentationServiceDelegateImpl::
+        GetOrCreateForWebContents(web_contents);
+  }
+  return nullptr;
+#else
+  return nullptr;
+#endif

[mark a. foltz, 2015/06/05 22:22:19]

Remove duplicate line by putting #endif before return nullptr.

[mark a. foltz, 2015/06/05 22:22:19]

#endif  // defined(ENABLE_MEDIA_ROUTER)

[haibinlu, 2015/06/06 02:37:33]

Done.

[haibinlu, 2015/06/06 02:37:33]

#if is very close by. 

+}
+
 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric,
                                                  const GURL& url) {
   if (url.is_valid()) {
     rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                             metric, url);
   }
 }
 
 content::DevToolsManagerDelegate*
 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
@@ skipping 68 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome