User constansts from chrome_switches.h

NOTRY=True

Review URL: https://chromiumcodereview.appspot.com/12924005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190878 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 7 insertions, 63 deletions

diff --git a/cloud_print/virtual_driver/virtual_driver_switches.cc b/cloud_print/virtual_driver/virtual_driver_switches.cc
deleted file mode 100644
index ed73e5e..0000000
--- a/cloud_print/virtual_driver/virtual_driver_switches.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2012 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 "cloud_print/virtual_driver/virtual_driver_switches.h"
-
-namespace switches {
-// Same value as as Chrome.
-const char kCloudPrintUserDataDir[]         = "user-data-dir";
-const char kCloudPrintDeleteFile[]          = "cloud-print-delete-file";
-const char kCloudPrintFile[]                = "cloud-print-file";
-const char kCloudPrintJobTitle[]            = "cloud-print-job-title";
-const char kCloudPrintFileType[]            = "cloud-print-file-type";
-const char kCloudPrintPrintTicket[]         = "cloud-print-print-ticket";
-}  // namespace switches
-
diff --git a/cloud_print/virtual_driver/virtual_driver_switches.h b/cloud_print/virtual_driver/virtual_driver_switches.h
deleted file mode 100644
index b11570b..0000000
--- a/cloud_print/virtual_driver/virtual_driver_switches.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CLOUD_PRINT_VIRTUAL_DRIVER_VIRTUAL_DRIVER_SWITCHES_H_
-#define CLOUD_PRINT_VIRTUAL_DRIVER_VIRTUAL_DRIVER_SWITCHES_H_
-
-namespace switches {
-// These constants are duplicated from chrome/common/chrome_switches.cc
-// in order to avoid dependency problems.
-// TODO(abodenha@chromium.org) Reunify them in some sensible manner.
-// Bug: http://crbug.com/88991
-
-// Location of Chrome user profile. Optional.
-extern const char kCloudPrintUserDataDir[];
-
-// Used with kCloudPrintFile.  Tells Chrome to delete the file when
-// finished displaying the print dialog.
-extern const char kCloudPrintDeleteFile[];
-
-// Tells chrome to display the cloud print dialog and upload the
-// specified file for printing.
-extern const char kCloudPrintFile[];
-
-// Used with kCloudPrintFile to specify a title for the resulting print
-// job.
-extern const char kCloudPrintJobTitle[];
-
-// Specifies the mime type to be used when uploading data from the
-// file referenced by cloud-print-file.
-// Defaults to "application/pdf" if unspecified.
-extern const char kCloudPrintFileType[];
-
-// Used with kCloudPrintFile to specify a JSON print ticket for the resulting
-// print job.
-// Defaults to null if unspecified.
-extern const char kCloudPrintPrintTicket[];
-}  // namespace switches
-
-#endif  // CLOUD_PRINT_VIRTUAL_DRIVER_VIRTUAL_DRIVER_SWITCHES_H_
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
index 7e2ffe9..9c46e45 100644
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
@@ -23,8 +23,8 @@
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
-#include "cloud_print/virtual_driver/virtual_driver_switches.h"
 #include "cloud_print/virtual_driver/win/port_monitor/spooler_win.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_consts.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_helpers.h"
@@ -215,8 +215,7 @@ bool LaunchPrintDialog(const base::FilePath& xps_path,
 
   base::FilePath chrome_profile = GetChromeProfilePath();
   if (!chrome_profile.empty()) {
-    command_line.AppendSwitchPath(switches::kCloudPrintUserDataDir,
-                                  chrome_profile);
+    command_line.AppendSwitchPath(switches::kUserDataDir, chrome_profile);
   }
 
   command_line.AppendSwitchPath(switches::kCloudPrintFile,
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc
index e9cf3b5..2ca2bd7 100644
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc
@@ -23,7 +23,7 @@
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
-#include "cloud_print/virtual_driver/virtual_driver_switches.h"
+#include "chrome/common/chrome_switches.h"
 #include "cloud_print/virtual_driver/win/port_monitor/spooler_win.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_consts.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_helpers.h"
diff --git a/cloud_print/virtual_driver/win/virtual_driver.gyp b/cloud_print/virtual_driver/win/virtual_driver.gyp
index d1bc0da0..851746f 100644
--- a/cloud_print/virtual_driver/win/virtual_driver.gyp
+++ b/cloud_print/virtual_driver/win/virtual_driver.gyp
@@ -9,6 +9,8 @@
   'target_defaults': {
     'dependencies': [
       '<(DEPTH)/base/base.gyp:base',
+      '<(DEPTH)/chrome/chrome.gyp:launcher_support',
+      '<(DEPTH)/chrome/common_constants.gyp:common_constants',
     ],
 
   },
diff --git a/cloud_print/virtual_driver/win/virtual_driver.gypi b/cloud_print/virtual_driver/win/virtual_driver.gypi
index 15e7b39..dfdc5c1 100644
--- a/cloud_print/virtual_driver/win/virtual_driver.gypi
+++ b/cloud_print/virtual_driver/win/virtual_driver.gypi
@@ -19,8 +19,6 @@
       'target_name': 'virtual_driver_lib<(virtual_driver_suffix)',
       'type': 'static_library',
       'sources': [
-        '../virtual_driver_switches.cc',
-        '../virtual_driver_switches.h',
         'virtual_driver_consts.cc',
         'virtual_driver_consts.h',
         'virtual_driver_helpers.cc',
@@ -35,7 +33,6 @@
         'port_monitor/port_monitor.h',
       ],
       'dependencies': [
-        '<(DEPTH)/chrome/chrome.gyp:launcher_support<(virtual_driver_suffix)',
         'virtual_driver_lib<(virtual_driver_suffix)',
       ],
     },
diff --git a/cloud_print/virtual_driver/win/virtual_driver64.gyp b/cloud_print/virtual_driver/win/virtual_driver64.gyp
index 885fb7c..b41a992 100644
--- a/cloud_print/virtual_driver/win/virtual_driver64.gyp
+++ b/cloud_print/virtual_driver/win/virtual_driver64.gyp
@@ -12,6 +12,8 @@
     ],
     'dependencies': [
       '<(DEPTH)/base/base.gyp:base_nacl_win64',
+      '<(DEPTH)/chrome/chrome.gyp:launcher_support64',
+      '<(DEPTH)/chrome/common_constants.gyp:common_constants_win64',
     ],
     'configurations': {
       'Common_Base': {