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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 2577183002: Add UMA for the number of devices in the chooser when a device is paired (Closed)
Patch Set: fixed android build Created 4 years 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after
1292 content::WebContents* web_contents, 1292 content::WebContents* web_contents,
1293 scoped_refptr<net::X509Certificate> certificate) { 1293 scoped_refptr<net::X509Certificate> certificate) {
1294 DevToolsWindow* devtools_window = 1294 DevToolsWindow* devtools_window =
1295 DevToolsWindow::GetInstanceForInspectedWebContents(web_contents); 1295 DevToolsWindow::GetInstanceForInspectedWebContents(web_contents);
1296 if (devtools_window) 1296 if (devtools_window)
1297 devtools_window->ShowCertificateViewer(certificate); 1297 devtools_window->ShowCertificateViewer(certificate);
1298 } 1298 }
1299 1299
1300 std::unique_ptr<content::BluetoothChooser> Browser::RunBluetoothChooser( 1300 std::unique_ptr<content::BluetoothChooser> Browser::RunBluetoothChooser(
1301 content::RenderFrameHost* frame, 1301 content::RenderFrameHost* frame,
1302 const content::BluetoothChooser::EventHandler& event_handler) { 1302 const content::BluetoothChooser::EventHandler& event_handler,
1303 bool accept_all_devices) {
1303 std::unique_ptr<BluetoothChooserController> bluetooth_chooser_controller( 1304 std::unique_ptr<BluetoothChooserController> bluetooth_chooser_controller(
1304 new BluetoothChooserController(frame, event_handler)); 1305 new BluetoothChooserController(frame, event_handler, accept_all_devices));
1305 1306
1306 std::unique_ptr<BluetoothChooserDesktop> bluetooth_chooser_desktop( 1307 std::unique_ptr<BluetoothChooserDesktop> bluetooth_chooser_desktop(
1307 new BluetoothChooserDesktop(bluetooth_chooser_controller.get())); 1308 new BluetoothChooserDesktop(bluetooth_chooser_controller.get()));
1308 1309
1309 std::unique_ptr<ChooserBubbleDelegate> chooser_bubble_delegate( 1310 std::unique_ptr<ChooserBubbleDelegate> chooser_bubble_delegate(
1310 new ChooserBubbleDelegate(frame, 1311 new ChooserBubbleDelegate(frame,
1311 std::move(bluetooth_chooser_controller))); 1312 std::move(bluetooth_chooser_controller)));
1312 1313
1313 Browser* browser = chrome::FindBrowserWithWebContents( 1314 Browser* browser = chrome::FindBrowserWithWebContents(
1314 WebContents::FromRenderFrameHost(frame)); 1315 WebContents::FromRenderFrameHost(frame));
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after
2600 // new window later, thus we need to navigate the window now. 2601 // new window later, thus we need to navigate the window now.
2601 if (contents) { 2602 if (contents) {
2602 contents->web_contents()->GetController().LoadURL( 2603 contents->web_contents()->GetController().LoadURL(
2603 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, 2604 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK,
2604 std::string()); // No extra headers. 2605 std::string()); // No extra headers.
2605 } 2606 }
2606 } 2607 }
2607 2608
2608 return contents != NULL; 2609 return contents != NULL;
2609 } 2610 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698