Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: chrome/browser/ui/webui/media_router/media_router_ui.cc

Issue 1821823002: [Media Router] Conditionally enable mDNS on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UI creation before provider fix Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/media_router/media_router_ui.h" 5 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/guid.h" 11 #include "base/guid.h"
12 #include "base/i18n/string_compare.h" 12 #include "base/i18n/string_compare.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/trace_event/trace_event.h" 16 #include "base/trace_event/trace_event.h"
17 #include "build/build_config.h"
17 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/media/router/create_presentation_connection_request.h" 19 #include "chrome/browser/media/router/create_presentation_connection_request.h"
19 #include "chrome/browser/media/router/issue.h" 20 #include "chrome/browser/media/router/issue.h"
20 #include "chrome/browser/media/router/issues_observer.h" 21 #include "chrome/browser/media/router/issues_observer.h"
21 #include "chrome/browser/media/router/media_route.h" 22 #include "chrome/browser/media/router/media_route.h"
22 #include "chrome/browser/media/router/media_router.h" 23 #include "chrome/browser/media/router/media_router.h"
23 #include "chrome/browser/media/router/media_router_factory.h" 24 #include "chrome/browser/media/router/media_router_factory.h"
24 #include "chrome/browser/media/router/media_router_metrics.h" 25 #include "chrome/browser/media/router/media_router_metrics.h"
25 #include "chrome/browser/media/router/media_router_mojo_impl.h" 26 #include "chrome/browser/media/router/media_router_mojo_impl.h"
26 #include "chrome/browser/media/router/media_routes_observer.h" 27 #include "chrome/browser/media/router/media_routes_observer.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 // Create a WebUIDataSource containing the chrome://media-router page's 171 // Create a WebUIDataSource containing the chrome://media-router page's
171 // content. 172 // content.
172 scoped_ptr<content::WebUIDataSource> html_source( 173 scoped_ptr<content::WebUIDataSource> html_source(
173 content::WebUIDataSource::Create(chrome::kChromeUIMediaRouterHost)); 174 content::WebUIDataSource::Create(chrome::kChromeUIMediaRouterHost));
174 175
175 content::WebContents* wc = web_ui->GetWebContents(); 176 content::WebContents* wc = web_ui->GetWebContents();
176 DCHECK(wc); 177 DCHECK(wc);
177 178
178 router_ = 179 router_ =
179 MediaRouterFactory::GetApiForBrowserContext(wc->GetBrowserContext()); 180 MediaRouterFactory::GetApiForBrowserContext(wc->GetBrowserContext());
181 #if defined(OS_WIN)
182 if (!router_->is_mdns_discovery_enabled()) {
183 router_->EnableMdnsDiscovery();
imcheng 2016/03/24 01:17:20 Prefer to move this to InitCommon
btolsch 2016/03/24 01:44:04 Done.
184 }
185 #endif
180 186
181 // Allows UI to load extensionview. 187 // Allows UI to load extensionview.
182 // TODO(haibinlu): limit object-src to current extension once crbug/514866 188 // TODO(haibinlu): limit object-src to current extension once crbug/514866
183 // is fixed. 189 // is fixed.
184 html_source->OverrideContentSecurityPolicyObjectSrc("object-src *;"); 190 html_source->OverrideContentSecurityPolicyObjectSrc("object-src *;");
185 191
186 AddLocalizedStrings(html_source.get()); 192 AddLocalizedStrings(html_source.get());
187 AddMediaRouterUIResources(html_source.get()); 193 AddMediaRouterUIResources(html_source.get());
188 // Ownership of |html_source| is transferred to the BrowserContext. 194 // Ownership of |html_source| is transferred to the BrowserContext.
189 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), 195 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 base::Time::Now() - start_time_); 583 base::Time::Now() - start_time_);
578 start_time_ = base::Time(); 584 start_time_ = base::Time();
579 } 585 }
580 } 586 }
581 587
582 void MediaRouterUI::UpdateMaxDialogHeight(int height) { 588 void MediaRouterUI::UpdateMaxDialogHeight(int height) {
583 handler_->UpdateMaxDialogHeight(height); 589 handler_->UpdateMaxDialogHeight(height);
584 } 590 }
585 591
586 } // namespace media_router 592 } // namespace media_router
OLDNEW
« chrome/browser/media/router/test_helper.h ('K') | « chrome/browser/media/router/test_helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698