mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

format previously missed chromium_src .cc files

Browse source
This commit is contained in:
Shelley Vohr 2018-04-17 21:57:05 -04:00
parent 8cc81509d7
commit f7d4437b3f
No known key found for this signature in database
GPG key ID: F13993A75599653C
58 changed files with 688 additions and 898 deletions
Download patch file Download diff file Expand all files Collapse all files

27
chromium_src/chrome/common/chrome_paths.cc
View file

@ -193,8 +193,8 @@ bool PathProvider(int key, base::FilePath* result) {
#else
if (!GetUserDownloadsDirectory(&cur))
return false;
// Do not create the download directory here, we have done it twice now
// and annoyed a lot of users.
// Do not create the download directory here, we have done it twice now
// and annoyed a lot of users.
#endif
break;
case chrome::DIR_CRASH_DUMPS:
@ -383,7 +383,7 @@ bool PathProvider(int key, base::FilePath* result) {
if (base::mac::AmIBundled()) {
cur = base::mac::FrameworkBundlePath();
cur = cur.Append(FILE_PATH_LITERAL("Resources"))
.Append(FILE_PATH_LITERAL("resources.pak"));
.Append(FILE_PATH_LITERAL("resources.pak"));
break;
}
#elif defined(OS_ANDROID)
@ -401,7 +401,7 @@ bool PathProvider(int key, base::FilePath* result) {
if (!PathService::Get(base::DIR_MODULE, &cur))
return false;
cur = cur.Append(FILE_PATH_LITERAL("resources"))
.Append(FILE_PATH_LITERAL("extension"));
.Append(FILE_PATH_LITERAL("extension"));
break;
#if defined(OS_CHROMEOS)
case chrome::DIR_CHROMEOS_WALLPAPERS:
@ -516,8 +516,8 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
cur = cur.Append(FILE_PATH_LITERAL("Google"))
.Append(FILE_PATH_LITERAL("Chrome"))
.Append(FILE_PATH_LITERAL("External Extensions"));
.Append(FILE_PATH_LITERAL("Chrome"))
.Append(FILE_PATH_LITERAL("External Extensions"));
create_dir = false;
#else
if (!PathService::Get(base::DIR_MODULE, &cur))
@ -543,19 +543,19 @@ bool PathProvider(int key, base::FilePath* result) {
case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
cur = base::FilePath(FILE_PATH_LITERAL(
"/Library/Google/Chrome/NativeMessagingHosts"));
cur = base::FilePath(
FILE_PATH_LITERAL("/Library/Google/Chrome/NativeMessagingHosts"));
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/Library/Application Support/Chromium/NativeMessagingHosts"));
#endif
#else // defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
cur = base::FilePath(
FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
cur = base::FilePath(
FILE_PATH_LITERAL("/etc/chromium/native-messaging-hosts"));
#endif
#endif // !defined(OS_MACOSX)
break;
@ -589,8 +589,7 @@ bool PathProvider(int key, base::FilePath* result) {
// TODO(bauerb): http://crbug.com/259796
base::ThreadRestrictions::ScopedAllowIO allow_io;
if (create_dir && !base::PathExists(cur) &&
!base::CreateDirectory(cur))
if (create_dir && !base::PathExists(cur) && !base::CreateDirectory(cur))
return false;
*result = cur;

4
chromium_src/chrome/common/chrome_paths.h
View file

@ -90,8 +90,8 @@ enum {
// succeed no matter the file exists or not.
FILE_FLASH_SYSTEM_PLUGIN, // Full path to the system version of NPAPI
// Flash plugin, downloadable from Adobe
// website. Querying this path might succeed no
// matter the file exists or not.
// website. Querying this path might succeed no
// matter the file exists or not.
FILE_NACL_PLUGIN, // Full path to the internal NaCl plugin file.
DIR_PNACL_BASE, // Full path to the base dir for PNaCl.
DIR_PNACL_COMPONENT, // Full path to the latest PNaCl version

10
chromium_src/chrome/common/chrome_paths_linux.cc
View file

@ -62,9 +62,8 @@ bool GetUserMediaDirectory(const std::string& xdg_name,
// (This also helps us sidestep issues with other apps grabbing ~/.chromium .)
bool GetDefaultUserDataDirectory(base::FilePath* result) {
std::unique_ptr<base::Environment> env(base::Environment::Create());
base::FilePath config_dir(GetXDGDirectory(env.get(),
kXdgConfigHomeEnvVar,
kDotConfigDir));
base::FilePath config_dir(
GetXDGDirectory(env.get(), kXdgConfigHomeEnvVar, kDotConfigDir));
#if defined(GOOGLE_CHROME_BUILD)
*result = config_dir.Append("google-chrome");
#else
@ -91,9 +90,8 @@ void GetUserCacheDirectory(const base::FilePath& profile_dir,
base::FilePath cache_dir;
if (!PathService::Get(base::DIR_CACHE, &cache_dir))
return;
base::FilePath config_dir(GetXDGDirectory(env.get(),
kXdgConfigHomeEnvVar,
kDotConfigDir));
base::FilePath config_dir(
GetXDGDirectory(env.get(), kXdgConfigHomeEnvVar, kDotConfigDir));
if (!config_dir.AppendRelativePath(profile_dir, &cache_dir))
return;

10
chromium_src/chrome/common/chrome_paths_win.cc
View file

@ -4,11 +4,11 @@
#include "chrome/common/chrome_paths_internal.h"
#include <windows.h>
#include <knownfolders.h>
#include <shellapi.h>
#include <shlobj.h>
#include <shobjidl.h>
#include <windows.h>
#include "base/files/file_path.h"
#include "base/path_service.h"
@ -28,8 +28,8 @@ bool GetUserDirectory(int csidl_folder, base::FilePath* result) {
// so we don't bother handling it.
wchar_t path_buf[MAX_PATH];
path_buf[0] = 0;
if (FAILED(SHGetFolderPath(NULL, csidl_folder, NULL,
SHGFP_TYPE_CURRENT, path_buf))) {
if (FAILED(SHGetFolderPath(NULL, csidl_folder, NULL, SHGFP_TYPE_CURRENT,
path_buf))) {
return false;
}
*result = base::FilePath(path_buf);
@ -68,8 +68,8 @@ bool GetUserDownloadsDirectorySafe(base::FilePath* result) {
// relocated to point to a "dangerous" folder, callers should validate that the
// returned path is not dangerous before using it.
bool GetUserDownloadsDirectory(base::FilePath* result) {
typedef HRESULT (WINAPI *GetKnownFolderPath)(
REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR*);
typedef HRESULT(WINAPI * GetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE,
PWSTR*);
GetKnownFolderPath f = reinterpret_cast<GetKnownFolderPath>(
GetProcAddress(GetModuleHandle(L"shell32.dll"), "SHGetKnownFolderPath"));
base::win::ScopedCoMem<wchar_t> path_buf;

7
chromium_src/chrome/common/print_messages.cc
View file

@ -26,8 +26,7 @@ PrintMsg_Print_Params::PrintMsg_Print_Params()
display_header_footer(false),
title(),
url(),
should_print_backgrounds(false) {
}
should_print_backgrounds(false) {}
PrintMsg_Print_Params::~PrintMsg_Print_Params() {}
@ -53,9 +52,7 @@ void PrintMsg_Print_Params::Reset() {
should_print_backgrounds = false;
}
PrintMsg_PrintPages_Params::PrintMsg_PrintPages_Params()
: pages() {
}
PrintMsg_PrintPages_Params::PrintMsg_PrintPages_Params() : pages() {}
PrintMsg_PrintPages_Params::~PrintMsg_PrintPages_Params() {}

24
chromium_src/chrome/common/tts_utterance_request.cc
View file

@ -5,26 +5,14 @@
#include "chrome/common/tts_utterance_request.h"
TtsUtteranceRequest::TtsUtteranceRequest()
: id(0),
volume(1.0),
rate(1.0),
pitch(1.0) {
}
: id(0), volume(1.0), rate(1.0), pitch(1.0) {}
TtsUtteranceRequest::~TtsUtteranceRequest() {
}
TtsUtteranceRequest::~TtsUtteranceRequest() {}
TtsVoice::TtsVoice()
: local_service(true),
is_default(false) {
}
TtsVoice::TtsVoice() : local_service(true), is_default(false) {}
TtsVoice::~TtsVoice() {
}
TtsVoice::~TtsVoice() {}
TtsUtteranceResponse::TtsUtteranceResponse()
: id(0) {
}
TtsUtteranceResponse::TtsUtteranceResponse() : id(0) {}
TtsUtteranceResponse::~TtsUtteranceResponse() {
}
TtsUtteranceResponse::~TtsUtteranceResponse() {}

4
chromium_src/chrome/common/widevine_cdm_constants.cc
View file

@ -9,5 +9,5 @@
const char kWidevineCdmPluginExtension[] = "";
const int32_t kWidevineCdmPluginPermissions = ppapi::PERMISSION_DEV |
ppapi::PERMISSION_PRIVATE;
const int32_t kWidevineCdmPluginPermissions =
ppapi::PERMISSION_DEV | ppapi::PERMISSION_PRIVATE;