Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / shell_integration_win.cc

diff --git a/src/chrome/browser/shell_integration_win.cc b/src/chrome/browser/shell_integration_win.cc
index 68e23b8..ba767e8 100644 (file)
--- a/src/chrome/browser/shell_integration_win.cc
+++ b/src/chrome/browser/shell_integration_win.cc
@@ -7,12 +7,12 @@
 #include <windows.h>
 #include <shlwapi.h>
 #include <shobjidl.h>
-#include <propkey.h>
+#include <propkey.h>  // Needs to come after shobjidl.h.
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
 #include "base/files/file_enumerator.h"
+#include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"