| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "app/message_box_flags.h" | 5 #include "app/message_box_flags.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/pref_service.h" | 8 #include "chrome/browser/pref_service.h" |
| 9 #include "chrome/browser/pref_value_store.h" | 9 #include "chrome/browser/pref_value_store.h" |
| 10 #include "chrome/browser/renderer_host/render_view_host.h" | 10 #include "chrome/browser/renderer_host/render_view_host.h" |
| (...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 // These values have been overridden by the profile preferences. | 754 // These values have been overridden by the profile preferences. |
| 755 EXPECT_EQ("UTF-8", webkit_prefs.default_encoding); | 755 EXPECT_EQ("UTF-8", webkit_prefs.default_encoding); |
| 756 EXPECT_EQ(20, webkit_prefs.default_font_size); | 756 EXPECT_EQ(20, webkit_prefs.default_font_size); |
| 757 EXPECT_EQ(false, webkit_prefs.text_areas_are_resizable); | 757 EXPECT_EQ(false, webkit_prefs.text_areas_are_resizable); |
| 758 EXPECT_EQ(true, webkit_prefs.uses_universal_detector); | 758 EXPECT_EQ(true, webkit_prefs.uses_universal_detector); |
| 759 | 759 |
| 760 // These should still be the default values. | 760 // These should still be the default values. |
| 761 #if defined(OS_MACOSX) | 761 #if defined(OS_MACOSX) |
| 762 const wchar_t kDefaultFont[] = L"Times"; | 762 const wchar_t kDefaultFont[] = L"Times"; |
| 763 #elif defined(OS_CHROMEOS) | 763 #elif defined(OS_CHROMEOS) |
| 764 const wchar_t kDefaultFont[] = L"Ascender Serif"; | 764 const wchar_t kDefaultFont[] = L"Tinos"; |
| 765 #else | 765 #else |
| 766 const wchar_t kDefaultFont[] = L"Times New Roman"; | 766 const wchar_t kDefaultFont[] = L"Times New Roman"; |
| 767 #endif | 767 #endif |
| 768 EXPECT_EQ(kDefaultFont, webkit_prefs.standard_font_family); | 768 EXPECT_EQ(kDefaultFont, webkit_prefs.standard_font_family); |
| 769 EXPECT_EQ(true, webkit_prefs.javascript_enabled); | 769 EXPECT_EQ(true, webkit_prefs.javascript_enabled); |
| 770 } | 770 } |
| 771 | 771 |
| 772 //////////////////////////////////////////////////////////////////////////////// | 772 //////////////////////////////////////////////////////////////////////////////// |
| 773 // Interstitial Tests | 773 // Interstitial Tests |
| 774 //////////////////////////////////////////////////////////////////////////////// | 774 //////////////////////////////////////////////////////////////////////////////// |
| (...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1470 | 1470 |
| 1471 // While the interstitial is showing, let's simulate the hidden page | 1471 // While the interstitial is showing, let's simulate the hidden page |
| 1472 // attempting to show a JS message. | 1472 // attempting to show a JS message. |
| 1473 IPC::Message* dummy_message = new IPC::Message; | 1473 IPC::Message* dummy_message = new IPC::Message; |
| 1474 bool did_suppress_message = false; | 1474 bool did_suppress_message = false; |
| 1475 contents()->RunJavaScriptMessage(L"This is an informative message", L"OK", | 1475 contents()->RunJavaScriptMessage(L"This is an informative message", L"OK", |
| 1476 kGURL, MessageBoxFlags::kIsJavascriptAlert, dummy_message, | 1476 kGURL, MessageBoxFlags::kIsJavascriptAlert, dummy_message, |
| 1477 &did_suppress_message); | 1477 &did_suppress_message); |
| 1478 EXPECT_TRUE(did_suppress_message); | 1478 EXPECT_TRUE(did_suppress_message); |
| 1479 } | 1479 } |
| OLD | NEW |