 +#endif  // CHROME_BROWSER_UI_WEBUI_FILE_PICKER_UI_H_
 diff --git a/chrome/browser/ui/webui/file_picker/file_picker_web_dialog.cc b/chrome/browser/ui/webui/file_picker/file_picker_web_dialog.cc
 new file mode 100644
-index 0000000..740f979
+index 0000000..f5c0fb7
 --- /dev/null
 +++ b/chrome/browser/ui/webui/file_picker/file_picker_web_dialog.cc
-@@ -0,0 +1,165 @@
+@@ -0,0 +1,164 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.

 .../ui/webui/chrome_web_ui_controller_factory.cc   |    3 +
 .../browser/ui/webui/file_picker/file_picker_ui.cc |   46 ++++++
 .../browser/ui/webui/file_picker/file_picker_ui.h  |   24 +++
 .../ui/webui/file_picker/file_picker_web_dialog.cc |  165 ++++++++++++++++++++
 chrome/chrome_browser_ui.gypi                      |    4 +
 chrome/common/url_constants.cc                     |    3 +
 chrome/common/url_constants.h                      |    2 +
 tools/gritsettings/resource_ids                    |    2 +-
 14 files changed, 429 insertions(+), 3 deletions(-)
 create mode 100644 chrome/browser/resources/file_picker/file_picker.css
 create mode 100644 chrome/browser/resources/file_picker/file_picker.html
 create mode 100644 chrome/browser/resources/file_picker/file_picker.js

From 3bec1b7e3f29c23c6d8f7d67a885f5181ae798ff Mon Sep 17 00:00:00 2001
From: Joone Hur <joone.hur@intel.com>
Date: Thu, 23 Oct 2014 19:25:14 -0700
Subject: [PATCH 2/5] Add file picker support using WebUI

File-picker has not been supported in oz-wl because Gtk+2 does not work under
Wayland, but Chromium Linux version still uses Gtk+2 for file-picker.
