diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 09:05:56 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 09:05:56 +0000 |
| commit | 6e6c451cdfbc3acfaa0dda793836068dba2ffc13 (patch) | |
| tree | 828be996d8ffe4c4a64cf3746af9a8adc286e526 /cloud_print/virtual_driver/win | |
| parent | 406f1923b6d8537c3e2d304608616ee3932c8797 (diff) | |
| download | chromium_src-6e6c451cdfbc3acfaa0dda793836068dba2ffc13.zip chromium_src-6e6c451cdfbc3acfaa0dda793836068dba2ffc13.tar.gz chromium_src-6e6c451cdfbc3acfaa0dda793836068dba2ffc13.tar.bz2 | |
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
Diffstat (limited to 'cloud_print/virtual_driver/win')
5 files changed, 7 insertions, 7 deletions
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': { |