Commit 672cd5a9 authored by fukino's avatar fukino Committed by Commit bot

Files: Add support for Google Sites.

By this CL, Google sites shown in Drive folder have correct icon, file-type description, and file extension.

BUG=597210
TEST=manually confirmed

Review-Url: https://codereview.chromium.org/2113723003
Cr-Commit-Position: refs/heads/master@{#403383}
parent 68623971
...@@ -981,6 +981,9 @@ Press any key to continue exploring. ...@@ -981,6 +981,9 @@ Press any key to continue exploring.
<message name="IDS_FILE_BROWSER_GMAP_DOCUMENT_FILE_TYPE" desc="Google map file type"> <message name="IDS_FILE_BROWSER_GMAP_DOCUMENT_FILE_TYPE" desc="Google map file type">
Google map Google map
</message> </message>
<message name="IDS_FILE_BROWSER_GSITE_DOCUMENT_FILE_TYPE" desc="Google site file type">
Google site
</message>
<message name="IDS_FILE_BROWSER_GLINK_DOCUMENT_FILE_TYPE" desc="Google Drive link file type"> <message name="IDS_FILE_BROWSER_GLINK_DOCUMENT_FILE_TYPE" desc="Google Drive link file type">
Google Drive link Google Drive link
</message> </message>
......
...@@ -76,6 +76,8 @@ void AddStringsForFileTypes(base::DictionaryValue* dict) { ...@@ -76,6 +76,8 @@ void AddStringsForFileTypes(base::DictionaryValue* dict) {
IDS_FILE_BROWSER_GMAP_DOCUMENT_FILE_TYPE); IDS_FILE_BROWSER_GMAP_DOCUMENT_FILE_TYPE);
SET_STRING("GSHEET_DOCUMENT_FILE_TYPE", SET_STRING("GSHEET_DOCUMENT_FILE_TYPE",
IDS_FILE_BROWSER_GSHEET_DOCUMENT_FILE_TYPE); IDS_FILE_BROWSER_GSHEET_DOCUMENT_FILE_TYPE);
SET_STRING("GSITE_DOCUMENT_FILE_TYPE",
IDS_FILE_BROWSER_GSITE_DOCUMENT_FILE_TYPE);
SET_STRING("GSLIDES_DOCUMENT_FILE_TYPE", SET_STRING("GSLIDES_DOCUMENT_FILE_TYPE",
IDS_FILE_BROWSER_GSLIDES_DOCUMENT_FILE_TYPE); IDS_FILE_BROWSER_GSLIDES_DOCUMENT_FILE_TYPE);
SET_STRING("GTABLE_DOCUMENT_FILE_TYPE", SET_STRING("GTABLE_DOCUMENT_FILE_TYPE",
......
...@@ -42,6 +42,7 @@ const HostedDocumentKind kHostedDocumentKinds[] = { ...@@ -42,6 +42,7 @@ const HostedDocumentKind kHostedDocumentKinds[] = {
{kGoogleTableMimeType, ".gtable"}, {kGoogleTableMimeType, ".gtable"},
{kGoogleFormMimeType, ".gform"}, {kGoogleFormMimeType, ".gform"},
{kGoogleMapMimeType, ".gmaps"}, {kGoogleMapMimeType, ".gmaps"},
{kGoogleSiteMimeType, ".gsite"},
}; };
const char kUnknownHostedDocumentExtension[] = ".glink"; const char kUnknownHostedDocumentExtension[] = ".glink";
......
...@@ -41,6 +41,7 @@ const char kGoogleSpreadsheetMimeType[] = ...@@ -41,6 +41,7 @@ const char kGoogleSpreadsheetMimeType[] =
const char kGoogleTableMimeType[] = "application/vnd.google-apps.table"; const char kGoogleTableMimeType[] = "application/vnd.google-apps.table";
const char kGoogleFormMimeType[] = "application/vnd.google-apps.form"; const char kGoogleFormMimeType[] = "application/vnd.google-apps.form";
const char kGoogleMapMimeType[] = "application/vnd.google-apps.map"; const char kGoogleMapMimeType[] = "application/vnd.google-apps.map";
const char kGoogleSiteMimeType[] = "application/vnd.google-apps.site";
const char kDriveFolderMimeType[] = "application/vnd.google-apps.folder"; const char kDriveFolderMimeType[] = "application/vnd.google-apps.folder";
// Escapes ' to \' in the |str|. This is designed to use for string value of // Escapes ' to \' in the |str|. This is designed to use for string value of
......
...@@ -93,6 +93,8 @@ TEST(DriveAPIUtilTest, HasHostedDocumentExtension) { ...@@ -93,6 +93,8 @@ TEST(DriveAPIUtilTest, HasHostedDocumentExtension) {
HasHostedDocumentExtension(base::FilePath::FromUTF8Unsafe("xx.gform"))); HasHostedDocumentExtension(base::FilePath::FromUTF8Unsafe("xx.gform")));
EXPECT_TRUE( EXPECT_TRUE(
HasHostedDocumentExtension(base::FilePath::FromUTF8Unsafe("xx.gmaps"))); HasHostedDocumentExtension(base::FilePath::FromUTF8Unsafe("xx.gmaps")));
EXPECT_TRUE(
HasHostedDocumentExtension(base::FilePath::FromUTF8Unsafe("xx.gsite")));
EXPECT_TRUE( EXPECT_TRUE(
HasHostedDocumentExtension(base::FilePath::FromUTF8Unsafe("xx.glink"))); HasHostedDocumentExtension(base::FilePath::FromUTF8Unsafe("xx.glink")));
......
...@@ -226,6 +226,10 @@ FileType.types = [ ...@@ -226,6 +226,10 @@ FileType.types = [
type: 'hosted', icon: 'gmap', name: 'GMAP_DOCUMENT_FILE_TYPE', type: 'hosted', icon: 'gmap', name: 'GMAP_DOCUMENT_FILE_TYPE',
subtype: 'map', pattern: /\.gmaps$/i subtype: 'map', pattern: /\.gmaps$/i
}, },
{
type: 'hosted', icon: 'gsite', name: 'GSITE_DOCUMENT_FILE_TYPE',
subtype: 'site', pattern: /\.gsite$/i
},
// Others // Others
{ {
......
...@@ -109,6 +109,12 @@ tree .tree-item[selected] > .tree-row > .shared[file-type-icon='folder'] { ...@@ -109,6 +109,12 @@ tree .tree-item[selected] > .tree-row > .shared[file-type-icon='folder'] {
url(../images/filetype/2x/filetype_map.png) 2x); url(../images/filetype/2x/filetype_map.png) 2x);
} }
[file-type-icon='gsite'] {
background-image: -webkit-image-set(
url(../images/filetype/filetype_gsite.png) 1x,
url(../images/filetype/2x/filetype_gsite.png) 2x);
}
[file-type-icon='image'] { [file-type-icon='image'] {
background-image: -webkit-image-set( background-image: -webkit-image-set(
url(../images/filetype/filetype_image.png) 1x, url(../images/filetype/filetype_image.png) 1x,
......
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
"filesystem:*.gtable", "filesystem:*.gtable",
"filesystem:*.gform", "filesystem:*.gform",
"filesystem:*.gmaps", "filesystem:*.gmaps",
"filesystem:*.gsite",
"filesystem:*.glink" "filesystem:*.glink"
] ]
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment