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

Unified Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc

Issue 1175783003: Split out Ash dependency in app info dialog unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split out ScopedViewsTestHelper Created 5 years, 6 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
« no previous file with comments | « chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
index f8851b86508556a24e275237d2797d5666d37818..45c34cb4841f022d5f3d04a814b73c2537f84ada 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
@@ -170,8 +170,9 @@ void AppInfoFooterPanel::SetPinnedToShelf(bool value) {
bool AppInfoFooterPanel::CanSetPinnedToShelf() const {
#if defined(USE_ASH)
// Non-Ash platforms don't have a shelf.
- if (chrome::GetHostDesktopTypeForNativeWindow(parent_window_) !=
- chrome::HOST_DESKTOP_TYPE_ASH) {
+ if (!ash::Shell::HasInstance() ||
+ chrome::GetHostDesktopTypeForNativeWindow(parent_window_) !=
+ chrome::HOST_DESKTOP_TYPE_ASH) {
return false;
}
« no previous file with comments | « chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698