From 2e85ff1f57b9d4cca28a89f3c955c5c34d6ac55c Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Fri, 4 Nov 2016 12:29:18 +0530 Subject: [PATCH] Fix code style --- atom/browser/api/atom_api_app.cc | 6 +++--- atom/common/api/atom_api_native_image.cc | 1 - chromium_src/chrome/browser/browser_process.h | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index 4b59914993c5..cabe751a046f 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -336,7 +336,7 @@ namespace api { namespace { -IconLoader::IconSize GetIconSizeByString(std::string size) { +IconLoader::IconSize GetIconSizeByString(const std::string& size) { if (size == "small") { return IconLoader::IconSize::SMALL; } else if (size == "large") { @@ -858,7 +858,7 @@ JumpListResult App::SetJumpList(v8::Local val, void App::GetFileIcon(const base::FilePath& path, mate::Arguments* args) { - base::DictionaryValue options; + mate::Dictionary options; IconLoader::IconSize icon_size; FileIconCallback callback; @@ -866,7 +866,7 @@ void App::GetFileIcon(const base::FilePath& path, icon_size = IconLoader::IconSize::NORMAL; } else { std::string icon_size_string; - options.GetString("size", &icon_size_string); + options.Get("size", &icon_size_string); icon_size = GetIconSizeByString(icon_size_string); } diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc index 1d4e20e3cfc8..0c174941dbf5 100644 --- a/atom/common/api/atom_api_native_image.cc +++ b/atom/common/api/atom_api_native_image.cc @@ -8,7 +8,6 @@ #include #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/gfx_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h" diff --git a/chromium_src/chrome/browser/browser_process.h b/chromium_src/chrome/browser/browser_process.h index a21371efb2ba..1459ca31a60a 100644 --- a/chromium_src/chrome/browser/browser_process.h +++ b/chromium_src/chrome/browser/browser_process.h @@ -19,8 +19,6 @@ namespace printing { class PrintJobManager; } -class IconManager; - // NOT THREAD SAFE, call only from the main thread. // These functions shouldn't return NULL unless otherwise noted. class BrowserProcess {