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

Side by Side Diff: chrome_frame/test_utils.h

Issue 113143006: Add base:: to string16 in chrome_frame/. (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
« no previous file with comments | « chrome_frame/test/ui_test.cc ('k') | chrome_frame/test_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_FRAME_TEST_UTILS_H_ 5 #ifndef CHROME_FRAME_TEST_UTILS_H_
6 #define CHROME_FRAME_TEST_UTILS_H_ 6 #define CHROME_FRAME_TEST_UTILS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include <atlbase.h> 10 #include <atlbase.h>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 private: 65 private:
66 enum RegistrationOperation { 66 enum RegistrationOperation {
67 REGISTER, 67 REGISTER,
68 UNREGISTER, 68 UNREGISTER,
69 }; 69 };
70 70
71 // The string "--call-registration-entrypoint". 71 // The string "--call-registration-entrypoint".
72 static const wchar_t kCallRegistrationEntrypointSwitch[]; 72 static const wchar_t kCallRegistrationEntrypointSwitch[];
73 73
74 static void DoRegistration(const string16& path, 74 static void DoRegistration(const base::string16& path,
75 RegistrationType registration_type, 75 RegistrationType registration_type,
76 RegistrationOperation registration_operation); 76 RegistrationOperation registration_operation);
77 77
78 // Contains the path of the most recently registered Chrome Frame DLL. 78 // Contains the path of the most recently registered Chrome Frame DLL.
79 std::wstring new_chrome_frame_dll_path_; 79 std::wstring new_chrome_frame_dll_path_;
80 80
81 // Contains the path of the Chrome Frame DLL to be registered at destruction. 81 // Contains the path of the Chrome Frame DLL to be registered at destruction.
82 std::wstring original_dll_path_; 82 std::wstring original_dll_path_;
83 83
84 // Indicates whether per user or per machine registration is needed. 84 // Indicates whether per user or per machine registration is needed.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 125 }
126 126
127 T* owner_; 127 T* owner_;
128 Method method_; 128 Method method_;
129 }; 129 };
130 130
131 // If the workstation is locked and cannot receive user input. 131 // If the workstation is locked and cannot receive user input.
132 bool IsWorkstationLocked(); 132 bool IsWorkstationLocked();
133 133
134 #endif // CHROME_FRAME_TEST_UTILS_H_ 134 #endif // CHROME_FRAME_TEST_UTILS_H_
OLDNEW
« no previous file with comments | « chrome_frame/test/ui_test.cc ('k') | chrome_frame/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698