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

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

Issue 5729005: webkit: use string16 in webkit_glue.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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) 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 "webkit/tools/test_shell/test_shell.h" 5 #include "webkit/tools/test_shell/test_shell.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <fontconfig/fontconfig.h> 9 #include <fontconfig/fontconfig.h>
10 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 GtkWidget* window = 480 GtkWidget* window =
481 gtk_widget_get_parent(gtk_widget_get_parent(drawing_area)); 481 gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
482 gtk_widget_destroy(window); 482 gtk_widget_destroy(window);
483 } 483 }
484 484
485 void TestShell::ResizeSubViews() { 485 void TestShell::ResizeSubViews() {
486 // This function is used on Windows to re-layout the window on a resize. 486 // This function is used on Windows to re-layout the window on a resize.
487 // GTK manages layout for us so we do nothing. 487 // GTK manages layout for us so we do nothing.
488 } 488 }
489 489
490 /* static */ void TestShell::DumpAllBackForwardLists(std::wstring* result) { 490 /* static */ void TestShell::DumpAllBackForwardLists(string16* result) {
491 result->clear(); 491 result->clear();
492 for (WindowList::iterator iter = TestShell::windowList()->begin(); 492 for (WindowList::iterator iter = TestShell::windowList()->begin();
493 iter != TestShell::windowList()->end(); iter++) { 493 iter != TestShell::windowList()->end(); iter++) {
494 GtkWindow* window = *iter; 494 GtkWindow* window = *iter;
495 TestShell* shell = 495 TestShell* shell =
496 static_cast<TestShell*>(g_object_get_data(G_OBJECT(window), 496 static_cast<TestShell*>(g_object_get_data(G_OBJECT(window),
497 "test-shell")); 497 "test-shell"));
498 shell->DumpBackForwardList(result); 498 shell->DumpBackForwardList(result);
499 } 499 }
500 } 500 }
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 resource_id = IDR_BROKENIMAGE_TESTSHELL; 652 resource_id = IDR_BROKENIMAGE_TESTSHELL;
653 break; 653 break;
654 case IDR_TEXTAREA_RESIZER: 654 case IDR_TEXTAREA_RESIZER:
655 resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL; 655 resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
656 break; 656 break;
657 } 657 }
658 return TestShell::NetResourceProvider(resource_id); 658 return TestShell::NetResourceProvider(resource_id);
659 } 659 }
660 660
661 } // namespace webkit_glue 661 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698