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

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

Issue 607613002: Elim parent_window parameter from network_connect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Elim includes Created 6 years, 2 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 <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 input_method::InputMethodManager::Get() 739 input_method::InputMethodManager::Get()
740 ->GetActiveIMEState() 740 ->GetActiveIMEState()
741 ->ChangeInputMethod(ime_id, false /* show_message */); 741 ->ChangeInputMethod(ime_id, false /* show_message */);
742 } 742 }
743 743
744 void SystemTrayDelegateChromeOS::ActivateIMEProperty(const std::string& key) { 744 void SystemTrayDelegateChromeOS::ActivateIMEProperty(const std::string& key) {
745 input_method::InputMethodManager::Get()->ActivateInputMethodMenuItem(key); 745 input_method::InputMethodManager::Get()->ActivateInputMethodMenuItem(key);
746 } 746 }
747 747
748 void SystemTrayDelegateChromeOS::ShowNetworkConfigure( 748 void SystemTrayDelegateChromeOS::ShowNetworkConfigure(
749 const std::string& network_id, 749 const std::string& network_id) {
750 gfx::NativeWindow parent_window) { 750 NetworkConfigView::Show(network_id, GetNativeWindow());
751 NetworkConfigView::Show(network_id, parent_window);
752 } 751 }
753 752
754 bool SystemTrayDelegateChromeOS::EnrollNetwork( 753 bool SystemTrayDelegateChromeOS::EnrollNetwork(
755 const std::string& network_id, 754 const std::string& network_id) {
756 gfx::NativeWindow parent_window) { 755 return enrollment::CreateDialog(network_id, GetNativeWindow());
757 return enrollment::CreateDialog(network_id, parent_window);
758 } 756 }
759 757
760 void SystemTrayDelegateChromeOS::ManageBluetoothDevices() { 758 void SystemTrayDelegateChromeOS::ManageBluetoothDevices() {
761 content::RecordAction(base::UserMetricsAction("ShowBluetoothSettingsPage")); 759 content::RecordAction(base::UserMetricsAction("ShowBluetoothSettingsPage"));
762 std::string sub_page = 760 std::string sub_page =
763 std::string(chrome::kSearchSubPage) + "#" + 761 std::string(chrome::kSearchSubPage) + "#" +
764 l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH); 762 l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH);
765 ShowSettingsSubPageForActiveUser(sub_page); 763 ShowSettingsSubPageForActiveUser(sub_page);
766 } 764 }
767 765
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 accessibility_subscription_.reset(); 1295 accessibility_subscription_.reset();
1298 else 1296 else
1299 OnAccessibilityModeChanged(details.notify); 1297 OnAccessibilityModeChanged(details.notify);
1300 } 1298 }
1301 1299
1302 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1300 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1303 return new SystemTrayDelegateChromeOS(); 1301 return new SystemTrayDelegateChromeOS();
1304 } 1302 }
1305 1303
1306 } // namespace chromeos 1304 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/ash/system_tray_delegate_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698