| OLD | NEW |
| 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 <ApplicationServices/ApplicationServices.h> | 5 #include <ApplicationServices/ApplicationServices.h> |
| 6 #import <Cocoa/Cocoa.h> | 6 #import <Cocoa/Cocoa.h> |
| 7 #import <objc/objc-runtime.h> | 7 #import <objc/objc-runtime.h> |
| 8 #include <sys/stat.h> | 8 #include <sys/stat.h> |
| 9 | 9 |
| 10 #include "webkit/tools/test_shell/test_shell.h" | 10 #include "webkit/tools/test_shell/test_shell.h" |
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 void TestShell::ShowStartupDebuggingDialog() { | 647 void TestShell::ShowStartupDebuggingDialog() { |
| 648 NSAlert* alert = [[[NSAlert alloc] init] autorelease]; | 648 NSAlert* alert = [[[NSAlert alloc] init] autorelease]; |
| 649 alert.messageText = @"Attach to me?"; | 649 alert.messageText = @"Attach to me?"; |
| 650 alert.informativeText = @"This would probably be a good time to attach your " | 650 alert.informativeText = @"This would probably be a good time to attach your " |
| 651 "debugger."; | 651 "debugger."; |
| 652 [alert addButtonWithTitle:@"OK"]; | 652 [alert addButtonWithTitle:@"OK"]; |
| 653 | 653 |
| 654 [alert runModal]; | 654 [alert runModal]; |
| 655 } | 655 } |
| 656 | 656 |
| 657 base::StringPiece TestShell::NetResourceProvider(int key) { | 657 base::StringPiece TestShell::ResourceProvider(int key) { |
| 658 base::StringPiece res; | 658 base::StringPiece res; |
| 659 g_resource_data_pack->GetStringPiece(key, &res); | 659 g_resource_data_pack->GetStringPiece(key, &res); |
| 660 return res; | 660 return res; |
| 661 } | 661 } |
| 662 | 662 |
| 663 //----------------------------------------------------------------------------- | 663 //----------------------------------------------------------------------------- |
| 664 | 664 |
| 665 namespace webkit_glue { | 665 namespace webkit_glue { |
| 666 | 666 |
| 667 string16 GetLocalizedString(int message_id) { | 667 string16 GetLocalizedString(int message_id) { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 case IDR_MEDIA_PLAY_BUTTON: | 714 case IDR_MEDIA_PLAY_BUTTON: |
| 715 case IDR_MEDIA_PLAY_BUTTON_DISABLED: | 715 case IDR_MEDIA_PLAY_BUTTON_DISABLED: |
| 716 case IDR_MEDIA_SOUND_FULL_BUTTON: | 716 case IDR_MEDIA_SOUND_FULL_BUTTON: |
| 717 case IDR_MEDIA_SOUND_NONE_BUTTON: | 717 case IDR_MEDIA_SOUND_NONE_BUTTON: |
| 718 case IDR_MEDIA_SOUND_DISABLED: | 718 case IDR_MEDIA_SOUND_DISABLED: |
| 719 case IDR_MEDIA_SLIDER_THUMB: | 719 case IDR_MEDIA_SLIDER_THUMB: |
| 720 case IDR_MEDIA_VOLUME_SLIDER_THUMB: | 720 case IDR_MEDIA_VOLUME_SLIDER_THUMB: |
| 721 case IDR_INPUT_SPEECH: | 721 case IDR_INPUT_SPEECH: |
| 722 case IDR_INPUT_SPEECH_RECORDING: | 722 case IDR_INPUT_SPEECH_RECORDING: |
| 723 case IDR_INPUT_SPEECH_WAITING: | 723 case IDR_INPUT_SPEECH_WAITING: |
| 724 return TestShell::NetResourceProvider(resource_id); | 724 return TestShell::ResourceProvider(resource_id); |
| 725 | 725 |
| 726 default: | 726 default: |
| 727 break; | 727 break; |
| 728 } | 728 } |
| 729 | 729 |
| 730 return base::StringPiece(); | 730 return base::StringPiece(); |
| 731 } | 731 } |
| 732 | 732 |
| 733 bool DownloadUrl(const std::string& url, NSWindow* caller_window) { | 733 bool DownloadUrl(const std::string& url, NSWindow* caller_window) { |
| 734 return false; | 734 return false; |
| 735 } | 735 } |
| 736 | 736 |
| 737 void DidLoadPlugin(const std::string& filename) { | 737 void DidLoadPlugin(const std::string& filename) { |
| 738 } | 738 } |
| 739 | 739 |
| 740 void DidUnloadPlugin(const std::string& filename) { | 740 void DidUnloadPlugin(const std::string& filename) { |
| 741 } | 741 } |
| 742 | 742 |
| 743 } // namespace webkit_glue | 743 } // namespace webkit_glue |
| OLD | NEW |