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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 24436002: Remove screen dimensions from image sent with Feedback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
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();
« chrome/browser/feedback/feedback_util.cc ('K') | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698