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

Unified Diff: chrome/browser/web_applications/web_app.cc

Issue 2826019: Add tests for chrome/browser/web_applications and mark some code as Win32 and... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 6 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/web_applications/web_app.h ('k') | chrome/browser/web_applications/web_app_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/web_applications/web_app.cc
===================================================================
--- chrome/browser/web_applications/web_app.cc (revision 50777)
+++ chrome/browser/web_applications/web_app.cc (working copy)
@@ -5,7 +5,7 @@
#include "chrome/browser/web_applications/web_app.h"
#if defined(OS_WIN)
-#include <ShellAPI.h>
+#include <shellapi.h>
#endif // defined(OS_WIN)
#include <algorithm>
@@ -43,6 +43,7 @@
namespace {
+#if defined(OS_WIN)
const FilePath::CharType kIconChecksumFileExt[] = FILE_PATH_LITERAL(".ico.md5");
// Returns true if |ch| is in visible ASCII range and not one of
@@ -81,12 +82,9 @@
file_name += c;
}
-#if defined(OS_WIN)
return FilePath(file_name);
-#elif defined(OS_POSIX)
- return FilePath(UTF16ToUTF8(file_name));
-#endif
}
+#endif // defined(OS_WIN)
// Returns relative directory of given web app url.
FilePath GetWebAppDir(const GURL& url) {
@@ -720,6 +718,7 @@
return profile_path.Append(chrome::kWebAppDirname);
}
+#if defined(TOOLKIT_VIEWS)
void GetIconsInfo(const webkit_glue::WebApplicationInfo& app_info,
IconInfoList* icons) {
DCHECK(icons);
@@ -734,6 +733,7 @@
std::sort(icons->begin(), icons->end(), &IconPrecedes);
}
+#endif
void GetShortcutInfoForTab(TabContents* tab_contents,
ShellIntegration::ShortcutInfo* info) {
« no previous file with comments | « chrome/browser/web_applications/web_app.h ('k') | chrome/browser/web_applications/web_app_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698