Index: chrome/browser/ui/ash/chrome_shell_delegate.cc |
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc |
index 1b3cbf7c4005248e9f6212195c2a0f534f6ebb73..ab329550ec8d9540a9bc2f508b24f5c171bdb8cd 100644 |
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc |
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc |
@@ -278,7 +278,7 @@ aura::client::UserActionClient* ChromeShellDelegate::CreateUserActionClient() { |
} |
void ChromeShellDelegate::OpenFeedbackPage() { |
- chrome::OpenFeedbackDialog(GetTargetBrowser()); |
+ chrome::OpenFeedbackDialog(GetTargetBrowserIfAvailable()); |
} |
void ChromeShellDelegate::RecordUserMetricsAction( |
@@ -449,7 +449,7 @@ string16 ChromeShellDelegate::GetProductName() const { |
} |
Browser* ChromeShellDelegate::GetTargetBrowser() { |
- Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); |
+ Browser* browser = GetTargetBrowserIfAvailable(); |
if (browser) |
return browser; |
return chrome::FindOrCreateTabbedBrowser( |
@@ -457,6 +457,10 @@ Browser* ChromeShellDelegate::GetTargetBrowser() { |
chrome::HOST_DESKTOP_TYPE_ASH); |
} |
+Browser* ChromeShellDelegate::GetTargetBrowserIfAvailable() { |
+ return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); |
+} |
+ |
keyboard::KeyboardControllerProxy* |
ChromeShellDelegate::CreateKeyboardControllerProxy() { |
return new AshKeyboardControllerProxy(); |