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

also format missing .cc files

Browse source
This commit is contained in:
Shelley Vohr 2018-04-17 21:55:30 -04:00
parent 53bdf22c85
commit c6f4bbd143
No known key found for this signature in database
GPG key ID: F13993A75599653C
181 changed files with 4102 additions and 4254 deletions
Download patch file Download diff file Expand all files Collapse all files

39
atom/browser/web_dialog_helper.cc
View file

@ -33,8 +33,8 @@ class FileSelectHelper : public base::RefCounted<FileSelectHelper>,
FileSelectHelper(content::RenderFrameHost* render_frame_host,
const content::FileChooserParams::Mode& mode)
: render_frame_host_(render_frame_host), mode_(mode) {
auto web_contents = content::WebContents::FromRenderFrameHost(
render_frame_host);
auto web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host);
content::WebContentsObserver::Observe(web_contents);
}
@ -54,7 +54,8 @@ class FileSelectHelper : public base::RefCounted<FileSelectHelper>,
~FileSelectHelper() override {}
#if defined(MAS_BUILD)
void OnOpenDialogDone(bool result, const std::vector<base::FilePath>& paths,
void OnOpenDialogDone(bool result,
const std::vector<base::FilePath>& paths,
const std::vector<std::string>& bookmarks)
#else
void OnOpenDialogDone(bool result, const std::vector<base::FilePath>& paths)
@ -80,7 +81,8 @@ class FileSelectHelper : public base::RefCounted<FileSelectHelper>,
}
#if defined(MAS_BUILD)
void OnSaveDialogDone(bool result, const base::FilePath& path,
void OnSaveDialogDone(bool result,
const base::FilePath& path,
const std::string& bookmark)
#else
void OnSaveDialogDone(bool result, const base::FilePath& path)
@ -116,9 +118,7 @@ class FileSelectHelper : public base::RefCounted<FileSelectHelper>,
}
// content::WebContentsObserver:
void WebContentsDestroyed() override {
render_frame_host_ = nullptr;
}
void WebContentsDestroyed() override { render_frame_host_ = nullptr; }
content::RenderFrameHost* render_frame_host_;
content::FileChooserParams::Mode mode_;
@ -142,8 +142,8 @@ file_dialog::Filters GetFileTypesFromAcceptType(
if (ascii_type[0] == '.') {
// If the type starts with a period it is assumed to be a file extension,
// like `.txt`, // so we just have to add it to the list.
base::FilePath::StringType extension(
ascii_type.begin(), ascii_type.end());
base::FilePath::StringType extension(ascii_type.begin(),
ascii_type.end());
// Skip the first character.
extensions.push_back(extension.substr(1));
} else {
@ -195,14 +195,9 @@ file_dialog::Filters GetFileTypesFromAcceptType(
namespace atom {
WebDialogHelper::WebDialogHelper(NativeWindow* window, bool offscreen)
: window_(window),
offscreen_(offscreen),
weak_factory_(this) {
}
WebDialogHelper::~WebDialogHelper() {
}
: window_(window), offscreen_(offscreen), weak_factory_(this) {}
WebDialogHelper::~WebDialogHelper() {}
void WebDialogHelper::RunFileChooser(
content::RenderFrameHost* render_frame_host,
@ -237,8 +232,9 @@ void WebDialogHelper::RunFileChooser(
auto* browser_context = static_cast<atom::AtomBrowserContext*>(
render_frame_host->GetProcess()->GetBrowserContext());
settings.default_path = browser_context->prefs()->GetFilePath(
prefs::kSelectFileLastDirectory).Append(params.default_file_name);
settings.default_path = browser_context->prefs()
->GetFilePath(prefs::kSelectFileLastDirectory)
.Append(params.default_file_name);
settings.properties = flags;
file_select_helper->ShowOpenDialog(settings);
}
@ -247,8 +243,7 @@ void WebDialogHelper::RunFileChooser(
void WebDialogHelper::EnumerateDirectory(content::WebContents* web_contents,
int request_id,
const base::FilePath& dir) {
int types = base::FileEnumerator::FILES |
base::FileEnumerator::DIRECTORIES |
int types = base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES |
base::FileEnumerator::INCLUDE_DOT_DOT;
base::FileEnumerator file_enum(dir, false, types);
@ -257,8 +252,8 @@ void WebDialogHelper::EnumerateDirectory(content::WebContents* web_contents,
while (!(path = file_enum.Next()).empty())
paths.push_back(path);
web_contents->GetRenderViewHost()->DirectoryEnumerationFinished(
request_id, paths);
web_contents->GetRenderViewHost()->DirectoryEnumerationFinished(request_id,
paths);
}
} // namespace atom