Chromium Code Reviews| Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
| index cff502b8a3b6e44e067817a83058e9b26b06b148..6fe0d59dce04fb5804325bfcef31e5fd4fbe39d6 100644 |
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
| @@ -356,7 +356,7 @@ void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() { |
| status == ash::LoginStatus::LOCKED || |
| wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) { |
| scoped_refptr<chromeos::HelpAppLauncher> help_app( |
| - new chromeos::HelpAppLauncher(GetNativeWindow())); |
| + new chromeos::HelpAppLauncher(nullptr /* parent_window */)); |
| help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE); |
| } else { |
| chrome::ScopedTabbedBrowserDisplayer displayer( |
| @@ -840,12 +840,6 @@ void SystemTrayDelegateChromeOS::ScreenIsUnlocked() { |
| ash::WmShell::Get()->UpdateAfterLoginStatusChange(GetUserLoginStatus()); |
| } |
| -gfx::NativeWindow SystemTrayDelegateChromeOS::GetNativeWindow() const { |
| - int container_id = SystemTrayClient::GetDialogParentContainerId(); |
| - return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), |
| - container_id); |
| -} |
|
stevenjb
2016/10/26 19:39:07
Hooray!
|
| - |
| // content::NotificationObserver implementation. |
| void SystemTrayDelegateChromeOS::Observe( |
| int type, |