Remove unused switches.

nwjs · Oct 14, 2012 · b7746e3 · b7746e3
1 parent a3502f8
commit b7746e3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 43 deletions.
diff --git a/src/common/shell_switches.cc b/src/common/shell_switches.cc
@@ -22,58 +22,43 @@
 
 namespace switches {
 
-// Check whether all system dependencies for running layout tests are met.
-const char kCheckLayoutTestSysDeps[] = "check-layout-test-sys-deps";
-
-// Tells Content Shell that it's running as a content_browsertest.
-const char kContentBrowserTest[] = "browser-test";
-
 // Makes Content Shell use the given path for its data directory.
 const char kContentShellDataPath[] = "data-path";
 
 // Enable developer tools
 const char kDeveloper[] = "developer";
 
-// Request pages to be dumped as text once they finished loading.
-const char kDumpRenderTree[] = "dump-render-tree";
-
-// Disables the timeout for layout tests.
-const char kNoTimeout[] = "no-timeout";
-
 // Display no toolbar
 const char kNoToolbar[] = "no-toolbar";
 
 // Open specified url
 const char kUrl[] = "url";
 
-// Show version and quit
-const char kVersion[] = "version";
-
 // Set current working directory
 const char kWorkingDirectory[] = "working-directory";
 
 const char kmMain[]       = "main";
 const char kmName[]       = "name";
 const char kmWebkit[]     = "webkit";
 const char kmNodejs[]     = "nodejs";
-const char kmRoot[]       = "root";
 const char kmWindow[]     = "window";
+
 const char kmTitle[]      = "title";
 const char kmToolbar[]    = "toolbar";
 const char kmIcon[]       = "icon";
-const char kmWidth[]      = "width";
-const char kmHeight[]     = "height";
+const char kmFrame[]      = "frame";
+const char kmShow[]       = "show";
+const char kmPosition[]   = "position";
 const char kmX[]          = "x";
 const char kmY[]          = "y";
-const char kmResizable[]  = "resizable";
-const char kmPosition[]   = "position";
+const char kmWidth[]      = "width";
+const char kmHeight[]     = "height";
 const char kmMinWidth[]   = "min_width";
 const char kmMinHeight[]  = "min_height";
 const char kmMaxWidth[]   = "max_width";
 const char kmMaxHeight[]  = "max_height";
-const char kmAsDesktop[]  = "as_desktop";
+const char kmResizable[]  = "resizable";
 const char kmFullscreen[] = "fullscreen";
-const char kmFrame[]      = "frame";
-const char kmShow[]       = "show";
+const char kmAsDesktop[]  = "as_desktop";
 
 }  // namespace switches
diff --git a/src/common/shell_switches.h b/src/common/shell_switches.h
@@ -9,41 +9,36 @@
 
 namespace switches {
 
-extern const char kCheckLayoutTestSysDeps[];
-extern const char kContentBrowserTest[];
 extern const char kContentShellDataPath[];
 extern const char kDeveloper[];
-extern const char kDumpRenderTree[];
-extern const char kNoTimeout[];
 extern const char kNoToolbar[];
 extern const char kUrl[];
-extern const char kVersion[];
 extern const char kWorkingDirectory[];
 
 // Manifest settings
 extern const char kmMain[];
 extern const char kmName[];
 extern const char kmWebkit[];
 extern const char kmNodejs[];
-extern const char kmRoot[];
 extern const char kmWindow[];
+
 extern const char kmTitle[];
 extern const char kmToolbar[];
 extern const char kmIcon[];
-extern const char kmWidth[];
-extern const char kmHeight[];
+extern const char kmFrame[];
+extern const char kmShow[];
+extern const char kmPosition[];
 extern const char kmX[];
 extern const char kmY[];
-extern const char kmResizable[];
-extern const char kmPosition[];
+extern const char kmWidth[];
+extern const char kmHeight[];
 extern const char kmMinWidth[];
 extern const char kmMinHeight[];
 extern const char kmMaxWidth[];
 extern const char kmMaxHeight[];
+extern const char kmResizable[];
 extern const char kmAsDesktop[];
 extern const char kmFullscreen[];
-extern const char kmFrame[];
-extern const char kmShow[];
 
 }  // namespace switches
 

diff --git a/src/shell_browser_context.cc b/src/shell_browser_context.cc
@@ -20,13 +20,10 @@
 
 #include "content/nw/src/shell_browser_context.h"
 
-#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
-#include "base/logging.h"
 #include "base/path_service.h"
-#include "base/threading/thread.h"
 #include "base/values.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/nw/src/browser/shell_download_manager_delegate.h"
@@ -61,11 +58,6 @@ ShellBrowserContext::~ShellBrowserContext() {
 
 void ShellBrowserContext::InitWhileIOAllowed() {
   CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kDumpRenderTree)) {
-    CHECK(testing_path_.CreateUniqueTempDir());
-    path_ = testing_path_.path();
-    return;
-  }
   if (cmd_line->HasSwitch(switches::kContentShellDataPath)) {
     path_ = cmd_line->GetSwitchValuePath(switches::kContentShellDataPath);
     return;