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

Side by Side Diff: cloud_print/virtual_driver/win/virtual_driver_helpers.cc

Issue 107383002: Use base namespace for string16 in components and cloud_print. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "cloud_print/virtual_driver/win/virtual_driver_helpers.h" 5 #include "cloud_print/virtual_driver/win/virtual_driver_helpers.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <winspool.h> 8 #include <winspool.h>
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/win/windows_version.h" 13 #include "base/win/windows_version.h"
14 #include "cloud_print/common/win/cloud_print_utils.h" 14 #include "cloud_print/common/win/cloud_print_utils.h"
15 15
16 namespace cloud_print { 16 namespace cloud_print {
17 17
18 const size_t kMaxMessageLen = 100; 18 const size_t kMaxMessageLen = 100;
19 19
20 void DisplayWindowsMessage(HWND hwnd, HRESULT hr, const string16 &caption) { 20 void DisplayWindowsMessage(HWND hwnd, HRESULT hr,
21 const base::string16 &caption) {
21 ::MessageBox(hwnd, GetErrorMessage(hr).c_str(), caption.c_str(), MB_OK); 22 ::MessageBox(hwnd, GetErrorMessage(hr).c_str(), caption.c_str(), MB_OK);
22 } 23 }
23 24
24 string16 GetPortMonitorDllName() { 25 base::string16 GetPortMonitorDllName() {
25 if (IsSystem64Bit()) { 26 if (IsSystem64Bit()) {
26 return string16(L"gcp_portmon64.dll"); 27 return base::string16(L"gcp_portmon64.dll");
27 } else { 28 } else {
28 return string16(L"gcp_portmon.dll"); 29 return base::string16(L"gcp_portmon.dll");
29 } 30 }
30 } 31 }
31 32
32 HRESULT GetPrinterDriverDir(base::FilePath* path) { 33 HRESULT GetPrinterDriverDir(base::FilePath* path) {
33 BYTE driver_dir_buffer[MAX_PATH * sizeof(wchar_t)]; 34 BYTE driver_dir_buffer[MAX_PATH * sizeof(wchar_t)];
34 DWORD needed = 0; 35 DWORD needed = 0;
35 if (!GetPrinterDriverDirectory(NULL, 36 if (!GetPrinterDriverDirectory(NULL,
36 NULL, 37 NULL,
37 1, 38 1,
38 driver_dir_buffer, 39 driver_dir_buffer,
(...skipping 12 matching lines...) Expand all
51 52
52 bool IsSystem64Bit() { 53 bool IsSystem64Bit() {
53 base::win::OSInfo::WindowsArchitecture arch = 54 base::win::OSInfo::WindowsArchitecture arch =
54 base::win::OSInfo::GetInstance()->architecture(); 55 base::win::OSInfo::GetInstance()->architecture();
55 return (arch == base::win::OSInfo::X64_ARCHITECTURE) || 56 return (arch == base::win::OSInfo::X64_ARCHITECTURE) ||
56 (arch == base::win::OSInfo::IA64_ARCHITECTURE); 57 (arch == base::win::OSInfo::IA64_ARCHITECTURE);
57 } 58 }
58 59
59 } 60 }
60 61
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698