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

Side by Side Diff: webkit/tools/test_shell/test_shell.cc

Issue 115482: Move WebMediaPlayerClientImpl files to WebKit API src location.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 7 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
« no previous file with comments | « webkit/glue/webmediaplayerclient_impl.cc ('k') | webkit/tools/test_shell/test_shell_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "v8_proxy.h" 5 #include "v8_proxy.h"
6 #undef LOG 6 #undef LOG
7 7
8 #include "webkit/tools/test_shell/test_shell.h" 8 #include "webkit/tools/test_shell/test_shell.h"
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 web_prefs_->minimum_font_size = 1; 393 web_prefs_->minimum_font_size = 1;
394 web_prefs_->minimum_logical_font_size = 9; 394 web_prefs_->minimum_logical_font_size = 9;
395 web_prefs_->javascript_can_open_windows_automatically = true; 395 web_prefs_->javascript_can_open_windows_automatically = true;
396 web_prefs_->dom_paste_enabled = true; 396 web_prefs_->dom_paste_enabled = true;
397 web_prefs_->developer_extras_enabled = !layout_test_mode_; 397 web_prefs_->developer_extras_enabled = !layout_test_mode_;
398 web_prefs_->shrinks_standalone_images_to_fit = false; 398 web_prefs_->shrinks_standalone_images_to_fit = false;
399 web_prefs_->uses_universal_detector = false; 399 web_prefs_->uses_universal_detector = false;
400 web_prefs_->text_areas_are_resizable = false; 400 web_prefs_->text_areas_are_resizable = false;
401 web_prefs_->java_enabled = true; 401 web_prefs_->java_enabled = true;
402 web_prefs_->allow_scripts_to_close_windows = false; 402 web_prefs_->allow_scripts_to_close_windows = false;
403 // It's off by default for Chrome, but we don't want to 403 // It's off by default for Chrome, but we don't want to
404 // lose the coverage of dynamic font tests in webkit test. 404 // lose the coverage of dynamic font tests in webkit test.
405 web_prefs_->remote_fonts_enabled = true; 405 web_prefs_->remote_fonts_enabled = true;
406 } 406 }
407 } 407 }
408 408
409 // static 409 // static
410 bool TestShell::RemoveWindowFromList(gfx::NativeWindow window) { 410 bool TestShell::RemoveWindowFromList(gfx::NativeWindow window) {
411 WindowList::iterator entry = 411 WindowList::iterator entry =
412 std::find(TestShell::windowList()->begin(), 412 std::find(TestShell::windowList()->begin(),
413 TestShell::windowList()->end(), 413 TestShell::windowList()->end(),
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 m_focusedWidgetHost = NULL; 582 m_focusedWidgetHost = NULL;
583 } 583 }
584 } 584 }
585 } 585 }
586 } 586 }
587 587
588 //----------------------------------------------------------------------------- 588 //-----------------------------------------------------------------------------
589 589
590 namespace webkit_glue { 590 namespace webkit_glue {
591 591
592 static bool g_media_player_available = false;
593
594 void SetMediaPlayerAvailable(bool value) {
595 g_media_player_available = value;
596 }
597
598 bool IsMediaPlayerAvailable() {
599 return g_media_player_available;
600 }
601
602 void PrecacheUrl(const char16* url, int url_length) {} 592 void PrecacheUrl(const char16* url, int url_length) {}
603 593
604 void AppendToLog(const char* file, int line, const char* msg) { 594 void AppendToLog(const char* file, int line, const char* msg) {
605 logging::LogMessage(file, line).stream() << msg; 595 logging::LogMessage(file, line).stream() << msg;
606 } 596 }
607 597
608 bool GetApplicationDirectory(std::wstring *path) { 598 bool GetApplicationDirectory(std::wstring *path) {
609 bool r; 599 bool r;
610 FilePath fp; 600 FilePath fp;
611 r = PathService::Get(base::DIR_EXE, &fp); 601 r = PathService::Get(base::DIR_EXE, &fp);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 } 643 }
654 #endif // OS_WIN 644 #endif // OS_WIN
655 return false; 645 return false;
656 } 646 }
657 647
658 std::wstring GetWebKitLocale() { 648 std::wstring GetWebKitLocale() {
659 return L"en-US"; 649 return L"en-US";
660 } 650 }
661 651
662 } // namespace webkit_glue 652 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webmediaplayerclient_impl.cc ('k') | webkit/tools/test_shell/test_shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698