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

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

Issue 2684793004: [Harmony] Harmonize Bluetooth dialogs. (Closed)
Patch Set: . Created 3 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ash/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 19 matching lines...) Expand all
30 #include "base/logging.h" 30 #include "base/logging.h"
31 #include "base/memory/ptr_util.h" 31 #include "base/memory/ptr_util.h"
32 #include "base/memory/weak_ptr.h" 32 #include "base/memory/weak_ptr.h"
33 #include "base/metrics/user_metrics.h" 33 #include "base/metrics/user_metrics.h"
34 #include "base/strings/utf_string_conversions.h" 34 #include "base/strings/utf_string_conversions.h"
35 #include "base/sys_info.h" 35 #include "base/sys_info.h"
36 #include "base/time/time.h" 36 #include "base/time/time.h"
37 #include "chrome/browser/browser_process.h" 37 #include "chrome/browser/browser_process.h"
38 #include "chrome/browser/chrome_notification_types.h" 38 #include "chrome/browser/chrome_notification_types.h"
39 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 39 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
40 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" 40 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_view.h"
41 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 41 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
42 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h" 42 #include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h"
43 #include "chrome/browser/chromeos/input_method/input_method_util.h" 43 #include "chrome/browser/chromeos/input_method/input_method_util.h"
44 #include "chrome/browser/chromeos/login/help_app_launcher.h" 44 #include "chrome/browser/chromeos/login/help_app_launcher.h"
45 #include "chrome/browser/chromeos/login/login_wizard.h" 45 #include "chrome/browser/chromeos/login/login_wizard.h"
46 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 46 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
47 #include "chrome/browser/chromeos/login/user_flow.h" 47 #include "chrome/browser/chromeos/login/user_flow.h"
48 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 48 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
49 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 49 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
50 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 50 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
51 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 51 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
52 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" 52 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h"
53 #include "chrome/browser/chromeos/profiles/profile_helper.h" 53 #include "chrome/browser/chromeos/profiles/profile_helper.h"
54 #include "chrome/browser/profiles/profile_manager.h" 54 #include "chrome/browser/profiles/profile_manager.h"
55 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 55 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
56 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h" 56 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h"
57 #include "chrome/browser/ui/ash/system_tray_client.h" 57 #include "chrome/browser/ui/ash/system_tray_client.h"
58 #include "chrome/browser/ui/browser.h" 58 #include "chrome/browser/ui/browser.h"
59 #include "chrome/browser/ui/browser_list.h" 59 #include "chrome/browser/ui/browser_list.h"
60 #include "chrome/browser/ui/chrome_pages.h" 60 #include "chrome/browser/ui/chrome_pages.h"
61 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 61 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
62 #include "chrome/browser/ui/singleton_tabs.h" 62 #include "chrome/browser/ui/singleton_tabs.h"
63 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
63 #include "chrome/common/chrome_switches.h" 64 #include "chrome/common/chrome_switches.h"
64 #include "chrome/common/features.h" 65 #include "chrome/common/features.h"
65 #include "chrome/common/pref_names.h" 66 #include "chrome/common/pref_names.h"
66 #include "chrome/common/url_constants.h" 67 #include "chrome/common/url_constants.h"
67 #include "chrome/grit/generated_resources.h" 68 #include "chrome/grit/generated_resources.h"
68 #include "chrome/grit/locale_settings.h" 69 #include "chrome/grit/locale_settings.h"
69 #include "chromeos/dbus/dbus_thread_manager.h" 70 #include "chromeos/dbus/dbus_thread_manager.h"
70 #include "chromeos/dbus/session_manager_client.h" 71 #include "chromeos/dbus/session_manager_client.h"
71 #include "chromeos/login/login_state.h" 72 #include "chromeos/login/login_state.h"
72 #include "chromeos/network/portal_detector/network_portal_detector.h" 73 #include "chromeos/network/portal_detector/network_portal_detector.h"
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 base::RecordAction( 422 base::RecordAction(
422 base::UserMetricsAction("StatusArea_Bluetooth_Connect_Known")); 423 base::UserMetricsAction("StatusArea_Bluetooth_Connect_Known"));
423 device->Connect(NULL, 424 device->Connect(NULL,
424 base::Bind(&base::DoNothing), 425 base::Bind(&base::DoNothing),
425 base::Bind(&BluetoothDeviceConnectError)); 426 base::Bind(&BluetoothDeviceConnectError));
426 return; 427 return;
427 } 428 }
428 // Show pairing dialog for the unpaired device. 429 // Show pairing dialog for the unpaired device.
429 base::RecordAction( 430 base::RecordAction(
430 base::UserMetricsAction("StatusArea_Bluetooth_Connect_Unknown")); 431 base::UserMetricsAction("StatusArea_Bluetooth_Connect_Unknown"));
431 BluetoothPairingDialog* dialog = new BluetoothPairingDialog(device);
432 // The dialog deletes itself on close. 432 // The dialog deletes itself on close.
433 dialog->ShowInContainer(SystemTrayClient::GetDialogParentContainerId()); 433 BluetoothPairingView::ShowDialog(
434 SystemTrayClient::GetDialogParentContainerId(),
435 ProfileManager::GetActiveUserProfile(), new ChromeWebContentsHandler,
436 device);
434 } 437 }
435 438
436 bool SystemTrayDelegateChromeOS::IsBluetoothDiscovering() const { 439 bool SystemTrayDelegateChromeOS::IsBluetoothDiscovering() const {
437 return bluetooth_adapter_ && bluetooth_adapter_->IsDiscovering(); 440 return bluetooth_adapter_ && bluetooth_adapter_->IsDiscovering();
438 } 441 }
439 442
440 void SystemTrayDelegateChromeOS::GetCurrentIME(ash::IMEInfo* info) { 443 void SystemTrayDelegateChromeOS::GetCurrentIME(ash::IMEInfo* info) {
441 input_method::InputMethodManager* manager = 444 input_method::InputMethodManager* manager =
442 input_method::InputMethodManager::Get(); 445 input_method::InputMethodManager::Get();
443 input_method::InputMethodUtil* util = manager->GetInputMethodUtil(); 446 input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 957 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
955 << "ENABLE_SUPERVISED_USERS undefined."; 958 << "ENABLE_SUPERVISED_USERS undefined.";
956 return base::string16(); 959 return base::string16();
957 } 960 }
958 961
959 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 962 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
960 return new SystemTrayDelegateChromeOS(); 963 return new SystemTrayDelegateChromeOS();
961 } 964 }
962 965
963 } // namespace chromeos 966 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698