chrome/browser/media_galleries/media_galleries_test_util.cc - Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media_galleries/media_galleries_test_util.cc

Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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/media_galleries/media_galleries_test_util.h ('k') | chrome/browser/media_galleries/media_gallery_context_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/media_galleries_test_util.cc

diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc

index 1c4dc4ae95f2ff2207777b59236642f7d821f161..1c98c86b63c53b4f6ee457cf997d859b44c12f7f 100644

--- a/chrome/browser/media_galleries/media_galleries_test_util.cc

+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc

@@ -4,9 +4,7 @@

#include "chrome/browser/media_galleries/media_galleries_test_util.h"

-#if defined(OS_WIN)

-#include <windows.h>

-#endif

+#include <stddef.h>

#include "base/base_paths.h"

#include "base/files/file_path.h"

@@ -14,6 +12,7 @@

#include "base/path_service.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/stringprintf.h"

+#include "build/build_config.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/media_galleries/fileapi/picasa_finder.h"

#include "chrome/browser/profiles/profile.h"

@@ -32,6 +31,7 @@

#endif // OS_MACOSX

#if defined(OS_WIN)

+#include <windows.h>

#include "base/test/test_reg_util_win.h"

#include "base/win/registry.h"

#endif // OS_WIN