Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / defaults.cc

diff --git a/src/chrome/browser/defaults.cc b/src/chrome/browser/defaults.cc
index f6748d6..ff39b1d 100644 (file)
--- a/src/chrome/browser/defaults.cc
+++ b/src/chrome/browser/defaults.cc
@@ -16,7 +16,13 @@ const bool kCanToggleSystemTitleBar = true;
 
 const int kOmniboxFontPixelSize = 16;
 
-const bool kRestorePopups = false;
+#if defined(TOOLKIT_VIEWS)
+#if defined(OS_WIN)
+const bool kShowLinkDisambiguationPopup = true;
+#else
+const bool kShowLinkDisambiguationPopup = false;
+#endif
+#endif
 
 #if defined(OS_CHROMEOS) || defined(OS_MACOSX)
 const bool kBrowserAliveWithNoWindows = true;
@@ -51,12 +57,6 @@ const bool kSyncAutoStarts = false;
 const bool kShowOtherBrowsersInAboutMemory = true;
 #endif
 
-#if defined(TOOLKIT_GTK)
-const bool kShowCancelButtonInTaskManager = true;
-#else
-const bool kShowCancelButtonInTaskManager = false;
-#endif
-
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 const bool kScrollEventChangesTab = true;
 #else