OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "win8/test/metro_registration_helper.h" | 5 #include "win8/test/metro_registration_helper.h" |
6 | 6 |
7 #include <shlobj.h> | 7 #include <shlobj.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 } | 91 } |
92 | 92 |
93 base::win::ScopedCoMem<wchar_t> current_app; | 93 base::win::ScopedCoMem<wchar_t> current_app; |
94 hr = registration->QueryCurrentDefault(protocol, AT_URLPROTOCOL, | 94 hr = registration->QueryCurrentDefault(protocol, AT_URLPROTOCOL, |
95 AL_EFFECTIVE, ¤t_app); | 95 AL_EFFECTIVE, ¤t_app); |
96 if (FAILED(hr)) { | 96 if (FAILED(hr)) { |
97 LOG(ERROR) << std::hex << hr; | 97 LOG(ERROR) << std::hex << hr; |
98 return false; | 98 return false; |
99 } | 99 } |
100 | 100 |
101 return string16(win8::test::kDefaultTestProgId).compare(current_app) == 0; | 101 return !base::string16(win8::test::kDefaultTestProgId).compare(current_app); |
102 } | 102 } |
103 | 103 |
104 } // namespace | 104 } // namespace |
105 | 105 |
106 namespace win8 { | 106 namespace win8 { |
107 | 107 |
108 bool MakeTestDefaultBrowserSynchronously() { | 108 bool MakeTestDefaultBrowserSynchronously() { |
109 static const wchar_t kDefaultBrowserProtocol[] = L"http"; | 109 static const wchar_t kDefaultBrowserProtocol[] = L"http"; |
110 | 110 |
111 if (!RegisterTestDefaultBrowser()) | 111 if (!RegisterTestDefaultBrowser()) |
(...skipping 12 matching lines...) Expand all Loading... |
124 std::vector<base::string16> choices; | 124 std::vector<base::string16> choices; |
125 OpenWithDialogController controller; | 125 OpenWithDialogController controller; |
126 HRESULT hr = controller.RunSynchronously( | 126 HRESULT hr = controller.RunSynchronously( |
127 NULL, kDefaultBrowserProtocol, win8::test::kDefaultTestExeName, &choices); | 127 NULL, kDefaultBrowserProtocol, win8::test::kDefaultTestExeName, &choices); |
128 LOG_IF(ERROR, FAILED(hr)) << std::hex << hr; | 128 LOG_IF(ERROR, FAILED(hr)) << std::hex << hr; |
129 DCHECK(IsTestDefaultForProtocol(kDefaultBrowserProtocol)); | 129 DCHECK(IsTestDefaultForProtocol(kDefaultBrowserProtocol)); |
130 return SUCCEEDED(hr); | 130 return SUCCEEDED(hr); |
131 } | 131 } |
132 | 132 |
133 } // namespace win8 | 133 } // namespace win8 |
OLD | NEW |