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

Unified Diff: webkit/tools/test_shell/test_shell_main_gtk.cc

Issue 10905: Unfork test_shell_main_gtk back into test_shell_main. (Closed)
Patch Set: Created 12 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: webkit/tools/test_shell/test_shell_main_gtk.cc
diff --git a/webkit/tools/test_shell/test_shell_main_gtk.cc b/webkit/tools/test_shell/test_shell_main_gtk.cc
deleted file mode 100644
index f9fd9073ca125ad50585eb5870c1a15fa25779d7..0000000000000000000000000000000000000000
--- a/webkit/tools/test_shell/test_shell_main_gtk.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <gtk/gtk.h>
-
-#include "base/at_exit.h"
-#include "base/command_line.h"
-#include "base/file_util.h"
-#include "base/icu_util.h"
-#include "base/path_service.h"
-#include "base/string_util.h"
-#include "base/message_loop.h"
-#include "webkit/glue/webkit_glue.h"
-#include "webkit/tools/test_shell/test_shell.h"
-#include "webkit/tools/test_shell/test_shell_switches.h"
-
-// TODO(port): This file is intended to match test_shell_main.cc.
-// Remerge this back into test_shell_main once we have enough supporting pieces
-// in place.
-
-int main(int argc, char* argv[]) {
- // Make Singletons work.
- base::AtExitManager at_exit_manager;
-
- gtk_init(&argc, &argv);
- // Only parse the command line after GTK's had a crack at it.
- CommandLine::SetArgcArgv(argc, argv);
-
- CommandLine parsed_command_line;
-
- icu_util::Initialize();
-
- bool layout_test_mode =
- parsed_command_line.HasSwitch(test_shell::kLayoutTests);
-
- bool interactive = !layout_test_mode;
- TestShell::InitializeTestShell(interactive);
-
- // Treat the first loose value as the initial URL to open.
- std::wstring uri;
-
- // Default to a homepage if we're interactive.
- if (interactive) {
- PathService::Get(base::DIR_SOURCE_ROOT, &uri);
- file_util::AppendToPath(&uri, L"webkit");
- file_util::AppendToPath(&uri, L"data");
- file_util::AppendToPath(&uri, L"test_shell");
- file_util::AppendToPath(&uri, L"index.html");
- // For now, loading from disk doesn't work so we set the URI to the
- // homepage.
- uri = L"http://www.google.com";
- }
-
- if (parsed_command_line.GetLooseValueCount() > 0) {
- CommandLine::LooseValueIterator iter =
- parsed_command_line.GetLooseValuesBegin();
- uri = *iter;
- }
-
- std::wstring js_flags =
- parsed_command_line.GetSwitchValue(test_shell::kJavaScriptFlags);
- // Test shell always exposes the GC.
- CommandLine::AppendSwitch(&js_flags, L"expose-gc");
- webkit_glue::SetJavaScriptFlags(js_flags);
-
- MessageLoopForUI main_message_loop;
-
- TestShell* shell;
- if (TestShell::CreateNewWindow(uri, &shell)) {
- // TODO(port): the rest of this. :)
- }
-
- main_message_loop.Run();
-
- return 0;
-}
« webkit/tools/test_shell/test_shell_main.cc ('K') | « webkit/tools/test_shell/test_shell_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698