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

Side by Side Diff: chrome/browser/tab_contents/web_contents_unittest.cc

Issue 2702001: Add platform_locale_settings file for CrOS. This is necessary because... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix cros unittest Created 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/pref_service.h" 7 #include "chrome/browser/pref_service.h"
8 #include "chrome/browser/renderer_host/render_view_host.h" 8 #include "chrome/browser/renderer_host/render_view_host.h"
9 #include "chrome/browser/renderer_host/render_widget_host_view.h" 9 #include "chrome/browser/renderer_host/render_widget_host_view.h"
10 #include "chrome/browser/renderer_host/test/test_render_view_host.h" 10 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 751
752 // These values have been overridden by the profile preferences. 752 // These values have been overridden by the profile preferences.
753 EXPECT_EQ("UTF-8", webkit_prefs.default_encoding); 753 EXPECT_EQ("UTF-8", webkit_prefs.default_encoding);
754 EXPECT_EQ(20, webkit_prefs.default_font_size); 754 EXPECT_EQ(20, webkit_prefs.default_font_size);
755 EXPECT_EQ(false, webkit_prefs.text_areas_are_resizable); 755 EXPECT_EQ(false, webkit_prefs.text_areas_are_resizable);
756 EXPECT_EQ(true, webkit_prefs.uses_universal_detector); 756 EXPECT_EQ(true, webkit_prefs.uses_universal_detector);
757 757
758 // These should still be the default values. 758 // These should still be the default values.
759 #if defined(OS_MACOSX) 759 #if defined(OS_MACOSX)
760 const wchar_t kDefaultFont[] = L"Times"; 760 const wchar_t kDefaultFont[] = L"Times";
761 #elif defined(OS_CHROMEOS)
762 const wchar_t kDefaultFont[] = L"Ascender Serif";
761 #else 763 #else
762 const wchar_t kDefaultFont[] = L"Times New Roman"; 764 const wchar_t kDefaultFont[] = L"Times New Roman";
763 #endif 765 #endif
764 EXPECT_EQ(kDefaultFont, webkit_prefs.standard_font_family); 766 EXPECT_EQ(kDefaultFont, webkit_prefs.standard_font_family);
765 EXPECT_EQ(true, webkit_prefs.javascript_enabled); 767 EXPECT_EQ(true, webkit_prefs.javascript_enabled);
766 } 768 }
767 769
768 //////////////////////////////////////////////////////////////////////////////// 770 ////////////////////////////////////////////////////////////////////////////////
769 // Interstitial Tests 771 // Interstitial Tests
770 //////////////////////////////////////////////////////////////////////////////// 772 ////////////////////////////////////////////////////////////////////////////////
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 1468
1467 // While the interstitial is showing, let's simulate the hidden page 1469 // While the interstitial is showing, let's simulate the hidden page
1468 // attempting to show a JS message. 1470 // attempting to show a JS message.
1469 IPC::Message* dummy_message = new IPC::Message; 1471 IPC::Message* dummy_message = new IPC::Message;
1470 bool did_suppress_message = false; 1472 bool did_suppress_message = false;
1471 contents()->RunJavaScriptMessage(L"This is an informative message", L"OK", 1473 contents()->RunJavaScriptMessage(L"This is an informative message", L"OK",
1472 kGURL, MessageBoxFlags::kIsJavascriptAlert, dummy_message, 1474 kGURL, MessageBoxFlags::kIsJavascriptAlert, dummy_message,
1473 &did_suppress_message); 1475 &did_suppress_message);
1474 EXPECT_TRUE(did_suppress_message); 1476 EXPECT_TRUE(did_suppress_message);
1475 } 1477 }
OLDNEW
« no previous file with comments | « chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-TW.xtb ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698