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

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 510223002: Fixed a crash while opening the file open/save dialogs on Windows 7 ASH. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dir Created 6 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index 87a0b739ea4e59ce00bdd854f957f62166d4e10c..f530490d1c77f5a7f9cc94ec73579cc4b2c3a123 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -31,6 +31,10 @@
#include "ui/shell_dialogs/shell_dialogs_delegate.h"
#endif
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
#if !defined(OS_CHROMEOS)
class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate {
public:
@@ -49,6 +53,10 @@ class ShellDialogsDelegateWin : public ui::ShellDialogsDelegate {
public:
ShellDialogsDelegateWin() {}
virtual bool IsWindowInMetro(gfx::NativeWindow window) OVERRIDE {
+#if defined(OS_WIN)
+ if (base::win::GetVersion() < base::win::VERSION_WIN8)
+ return false;
+#endif
return chrome::IsNativeViewInAsh(window);
}
private:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698