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

Fix code style

Browse source
This commit is contained in:
deepak1556 2016-11-04 12:29:18 +05:30 committed by Kevin Sawicki
parent 3d47c9b71d
commit 2e85ff1f57
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_app.cc
View file

@ -336,7 +336,7 @@ namespace api {
namespace { namespace {
IconLoader::IconSize GetIconSizeByString(std::string size) { IconLoader::IconSize GetIconSizeByString(const std::string& size) {
if (size == "small") { if (size == "small") {
return IconLoader::IconSize::SMALL; return IconLoader::IconSize::SMALL;
} else if (size == "large") { } else if (size == "large") {
@ -858,7 +858,7 @@ JumpListResult App::SetJumpList(v8::Local<v8::Value> val,
void App::GetFileIcon(const base::FilePath& path, void App::GetFileIcon(const base::FilePath& path,
mate::Arguments* args) { mate::Arguments* args) {
base::DictionaryValue options; mate::Dictionary options;
IconLoader::IconSize icon_size; IconLoader::IconSize icon_size;
FileIconCallback callback; FileIconCallback callback;
@ -866,7 +866,7 @@ void App::GetFileIcon(const base::FilePath& path,
icon_size = IconLoader::IconSize::NORMAL; icon_size = IconLoader::IconSize::NORMAL;
} else { } else {
std::string icon_size_string; std::string icon_size_string;
options.GetString("size", &icon_size_string); options.Get("size", &icon_size_string);
icon_size = GetIconSizeByString(icon_size_string); icon_size = GetIconSizeByString(icon_size_string);
} }

1
atom/common/api/atom_api_native_image.cc
View file

@ -8,7 +8,6 @@
#include <vector> #include <vector>
#include "atom/common/asar/asar_util.h" #include "atom/common/asar/asar_util.h"
#include "atom/common/native_mate_converters/callback.h"
#include "atom/common/native_mate_converters/file_path_converter.h" #include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/gfx_converter.h" #include "atom/common/native_mate_converters/gfx_converter.h"
#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h"

2
chromium_src/chrome/browser/browser_process.h
View file

@ -19,8 +19,6 @@ namespace printing {
class PrintJobManager; class PrintJobManager;
} }
class IconManager;
// NOT THREAD SAFE, call only from the main thread. // NOT THREAD SAFE, call only from the main thread.
// These functions shouldn't return NULL unless otherwise noted. // These functions shouldn't return NULL unless otherwise noted.
class BrowserProcess { class BrowserProcess {