-From 5d1a8ad0e593a61c90938f97d57548e381ed28ab Mon Sep 17 00:00:00 2001
-From: "joone.hur@intel.com"
- <joone.hur@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>
+From 0f6390e3adf368e8136cd57ec63679c9a724ca49 Mon Sep 17 00:00:00 2001
+From: "joone.hur@intel.com" <joone.hur@intel.com>
 Date: Sat, 6 Sep 2014 12:30:11 -0700
-Subject: [PATCH] Add file picker support using WebUI
+Subject: [PATCH 3/5] Add file picker support using WebUI
 
 File-picker has not been supported in oz-wl because Gtk+2 does not work under
 Wayland. Chromium Linux version still uses Gtk+ for file-picker.

 .../browser/resources/file_picker/file_picker.css  |   72 +++++++++
 .../browser/resources/file_picker/file_picker.html |   37 +++++
 .../browser/resources/file_picker/file_picker.js   |   51 ++++++
 .../aura/chrome_browser_main_extra_parts_aura.cc   |   11 +-
 .../ui/webui/chrome_web_ui_controller_factory.cc   |    5 +
 .../browser/ui/webui/file_picker/file_picker_ui.cc |   47 ++++++
 .../browser/ui/webui/file_picker/file_picker_ui.h  |   24 +++

 chrome/common/url_constants.cc                     |    3 +
 chrome/common/url_constants.h                      |    2 +
 tools/gritsettings/resource_ids                    |    2 +-
 15 files changed, 433 insertions(+), 5 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
