Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginUtil.cpp

Issue 4899473029332992: Noissue - Remove dead code (Closed)
Patch Set: remove more #include directives Created March 20, 2015, 9:05 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/plugin/PluginUtil.h ('k') | src/plugin/PluginWbPassThrough.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include "PluginStdAfx.h" 18 #include "PluginStdAfx.h"
19 #include <algorithm> 19 #include "PluginUtil.h"
20 #include <stdexcept>
21 #include <vector>
22
23 #include "../shared/Utils.h" 20 #include "../shared/Utils.h"
24 #include "PluginUtil.h" 21 #include <memory>
25 #include "PluginSettings.h" 22 #include <WinInet.h>
26 23
27 std::wstring HtmlFolderPath() 24 std::wstring HtmlFolderPath()
28 { 25 {
29 return GetDllDir() + L"html\\templates\\"; 26 return GetDllDir() + L"html\\templates\\";
30 } 27 }
31 28
32 std::wstring UserSettingsFileUrl() 29 std::wstring UserSettingsFileUrl()
33 { 30 {
34 return FileUrl(HtmlFolderPath() + L"index.html"); 31 return FileUrl(HtmlFolderPath() + L"index.html");
35 } 32 }
(...skipping 11 matching lines...) Expand all
47 } 44 }
48 45
49 std::wstring GetLocationUrl(IWebBrowser2& browser) 46 std::wstring GetLocationUrl(IWebBrowser2& browser)
50 { 47 {
51 ATL::CComBSTR locationUrl; 48 ATL::CComBSTR locationUrl;
52 if (FAILED(browser.get_LocationURL(&locationUrl)) || !locationUrl) 49 if (FAILED(browser.get_LocationURL(&locationUrl)) || !locationUrl)
53 { 50 {
54 return std::wstring(); 51 return std::wstring();
55 } 52 }
56 return std::wstring(locationUrl, locationUrl.Length()); 53 return std::wstring(locationUrl, locationUrl.Length());
57 } 54 }
55
56 void UnescapeUrl(std::wstring& url)
57 {
58 try
59 {
60 DWORD result_length = INTERNET_MAX_URL_LENGTH;
61 std::unique_ptr<wchar_t[]> result(new wchar_t[result_length]);
62 HRESULT hr = UrlUnescapeW(const_cast<wchar_t*>(url.c_str()), result.get(), & result_length, 0);
63 if (hr == S_OK)
64 {
65 url = std::wstring(result.get(), result_length);
66 }
67 /*
68 * Do nothing. This masks error return values from UrlUnescape without loggi ng the error.
69 */
70 }
71 catch(std::bad_alloc e)
72 {
73 /*
74 * When the code has a systematic way of handling bad_alloc, we'll rethrow ( probably).
75 * Until then, we mask the exception and make no modification.
76 */
77 }
78 catch(...)
79 {
80 // no modification if any other exception
81 }
82 }
OLDNEW
« no previous file with comments | « src/plugin/PluginUtil.h ('k') | src/plugin/PluginWbPassThrough.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld