Revert 82509 - Moving slideshow to...

Revert 82509 - Moving slideshow to extension.TEST=noneBUG=chromium-os:11430Review URL: http://codereview.chromium.org/6873100
TBR=serya@google.com
Review URL: http://codereview.chromium.org/6879122

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82515 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/browser_resources.grd

@@ -106,6 +106,7 @@
         <include name="IDR_OFFLINE_LOAD_HTML" file="resources\offline_load.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_settings.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" flattenhtml="true" type="BINDATA" />

chrome/browser/resources/component_extension_resources.grd

@@ -23,10 +23,8 @@
 
       <if expr="pp_ifdef('file_manager_extension')">
         <include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_BACKGROUND" file="file_manager/background.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_SLIDESHOW" file="file_manager/slideshow.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_ICON16" file="file_manager/images/icon16.png" type="BINDATA" />
         <include name="IDR_FILE_MANAGER_EXIF_READER" file="file_manager/js/exif_reader.js" type="BINDATA" />
+
         <include name="IDR_PICASA_UPLOAD_PAGE" file="picasaweb_uploader/upload.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_PICASA_BACKGROUND_PAGE" file="picasaweb_uploader/background.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_PICASA_NOTIFICATION_PAGE" file="picasaweb_uploader/notification.html" flattenhtml="true" type="BINDATA" />

chrome/browser/resources/file_manager/manifest.json

@@ -5,7 +5,6 @@
   "version": "0.1",
   "description": "File Manager",
   "incognito" : "split",
-  "background_page": "background.html",
   "icons": {
     "16": "images/icon16.png"
   },
@@ -14,21 +13,5 @@
     "fileBrowserPrivate",
     "chrome://extension-icon/",
     "chrome://resources/"
-  ],
-  "file_browser_handlers": [
-    {
-      "id": "preview",
-      "default_title": "Preview image",
-      "file_filters": [
-        "filesystem:*.gif",
-        "filesystem:*.jpg",
-        "filesystem:*.jpeg",
-        "filesystem:*.png",
-        "filesystem:*.GIF",
-        "filesystem:*.JPG",
-        "filesystem:*.JPEG",
-        "filesystem:*.PNG"
-      ]
-    }
   ]
 }

chrome/browser/resources/shared_resources.grd

@@ -32,10 +32,6 @@ without changes to the corresponding grd file. paaaae -->
                file="shared/css/tree.css.js" type="BINDATA" />
       <include name="IDR_SHARED_IMAGES_THROBBER"
                file="shared/images/throbber.svg" type="BINDATA" />
-      <include name="IDR_SHARED_IMAGES_MEDIAPLAYER_PREV"
-               file="shared/images/mediaplayer_prev.png" type="BINDATA" />
-      <include name="IDR_SHARED_IMAGES_MEDIAPLAYER_NEXT"
-               file="shared/images/mediaplayer_next.png" type="BINDATA" />
       <include name="IDR_SHARED_JS_CR"
                file="shared/js/cr.js" type="BINDATA" />
       <include name="IDR_SHARED_JS_CR_COMMAND_LINE"
@@ -110,8 +106,6 @@ without changes to the corresponding grd file. paaaae -->
                file="shared/js/i18n_template.js" type="BINDATA" />
       <include name="IDR_SHARED_JS_LOCAL_STRINGS"
                file="shared/js/local_strings.js" type="BINDATA" />
-      <include name="IDR_SHARED_JS_MEDIA_COMMON"
-               file="shared/js/media_common.js" type="BINDATA" />
       <include name="IDR_SHARED_JS_PARSE_HTML_SUBSET"
                file="shared/js/parse_html_subset.js" type="BINDATA" />
       <include name="IDR_SHARED_JS_UTIL"

chrome/browser/resources/file_manager/slideshow.html → chrome/browser/resources/slideshow.html

@@ -45,7 +45,7 @@ body {
 }
 
 #prevbutton > div {
-  background: url('chrome://resources/images/mediaplayer_prev.png');
+  background: url('shared/images/mediaplayer_prev.png');
   background-repeat: no-repeat;
   background-position: 4px 8px;
   width: 100%;
@@ -75,7 +75,7 @@ body {
 }
 
 #nextbutton > div {
-  background: url('chrome://resources/images/mediaplayer_next.png');
+  background: url('shared/images/mediaplayer_next.png');
   background-repeat: no-repeat;
   background-position: 4px 8px;
   width: 100%;
@@ -99,8 +99,8 @@ button:hover {
 }
 
 </style>
-<script src="chrome://resources/js/local_strings.js"></script>
-<script src="chrome://resources/js/media_common.js"></script>
+<script src="shared/js/local_strings.js"></script>
+<script src="shared/js/media_common.js"></script>
 <script>
 
 document.addEventListener('DOMContentLoaded', load);
@@ -119,7 +119,7 @@ function $(o) {
 var currentPicture = null;
 var prevPicture = null;
 var currentFileOffset = 0;
-var filelist = [];
+var filelist;
 var moveRight = false;
 var lastimg = null;
 
@@ -146,7 +146,7 @@ function loadedPicture() {
    }, 10);
 }
 
-function transitionTo(fileEntry, fromTheRight) {
+function transitionTo(path, fromTheRight) {
   if (currentPicture) {
     if (prevPicture) {
       $('main').removeChild(prevPicture);
@@ -166,18 +166,20 @@ function transitionTo(fileEntry, fromTheRight) {
   lastimg = image;
   image.onload = loadedPicture;
   image.onerror = loadedPicture;
-  image.src = 'filesystem:' +
-              chrome.extension.getURL('/external/' + fileEntry.fullPath);
+  document.location.hash = path;
+  image.src = 'file://' + path;
   currentPicture.appendChild(image);
   moveRight = fromTheRight;
 }
 
-function browseFileResult() {
-  filelist = chrome.extension.getBackgroundPage().getLastFileEntries() || [];
-  currentFileOffset = 0;
-  if (filelist.length > 0) {
-    transitionTo(filelist[currentFileOffset], true);
+function browseFileResult(info, results) {
+  filelist = results;
+  if (info.currentOffset) {
+    currentFileOffset = info.currentOffset;
+  } else {
+    currentFileOffset = 0;
   }
+  transitionTo(filelist[currentFileOffset].path, true);
 }
 
 function keyPressed(e) {
@@ -185,14 +187,14 @@ function keyPressed(e) {
   if (e.keyCode == 37) {
     if (currentFileOffset > 0) {
       currentFileOffset--;
-      transitionTo(filelist[currentFileOffset], false);
+      transitionTo(filelist[currentFileOffset].path, false);
     }
   }
   // Right Pressed
   if (e.keyCode == 39) {
     if (currentFileOffset < (filelist.length - 1)) {
       currentFileOffset++;
-      transitionTo(filelist[currentFileOffset], true);
+      transitionTo(filelist[currentFileOffset].path, true);
     }
   }
 }
@@ -200,25 +202,34 @@ function keyPressed(e) {
 function load() {
   localStrings = new LocalStrings();
 
-  browseFileResult();
+  document.onkeydown = keyPressed;
+  if (document.location.href.indexOf('#') != -1) {
+    var currentpathArray = document.location.href.split('#');
+    var path = currentpathArray[1];
+    chrome.send('getChildren', [path]);
+  }
 }
 
 function prevButtonClick() {
   if (currentFileOffset > 0) {
     currentFileOffset--;
-    transitionTo(filelist[currentFileOffset], false);
+    transitionTo(filelist[currentFileOffset].path, false);
   }
 }
 
 function nextButtonClick() {
   if (currentFileOffset < (filelist.length - 1)) {
     currentFileOffset++;
-    transitionTo(filelist[currentFileOffset], true);
+    transitionTo(filelist[currentFileOffset].path, true);
   }
 }
 
+function toggleFullscreen() {
+  chrome.send('toggleFullscreen', ['']);
+}
+
 </script>
-<body onkeydown="keyPressed(event)">
+<body>
 <div id="main"></div>
 <div id="glow"></div>
 <div id="playercontrols">

chrome/browser/ui/webui/chrome_web_ui_factory.cc

@@ -27,6 +27,7 @@
 #include "chrome/browser/ui/webui/plugins_ui.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
 #include "chrome/browser/ui/webui/remoting_ui.h"
+#include "chrome/browser/ui/webui/slideshow_ui.h"
 #include "chrome/browser/ui/webui/sync_internals_ui.h"
 #include "chrome/browser/ui/webui/textfields_ui.h"
 #include "chrome/common/chrome_switches.h"
@@ -201,6 +202,8 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
     return &NewWebUI<RegisterPageUI>;
   if (url.host() == chrome::kChromeUISettingsHost)
     return &NewWebUI<OptionsUI>;
+  if (url.host() == chrome::kChromeUISlideshowHost)
+    return &NewWebUI<SlideshowUI>;
   if (url.host() == chrome::kChromeUISimUnlockHost)
     return &NewWebUI<chromeos::SimUnlockUI>;
   if (url.host() == chrome::kChromeUISystemInfoHost)

chrome/browser/ui/webui/slideshow_ui.cc

+// Copyright (c) 2011 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.
+
+#include "chrome/browser/ui/webui/slideshow_ui.h"
+
+#include "base/callback.h"
+#include "base/memory/singleton.h"
+#include "base/memory/weak_ptr.h"
+#include "base/message_loop.h"
+#include "base/path_service.h"
+#include "base/string_piece.h"
+#include "base/string_util.h"
+#include "base/threading/thread.h"
+#include "base/time.h"
+#include "base/utf_string_conversions.h"
+#include "base/values.h"
+#include "chrome/browser/history/history_types.h"
+#include "chrome/browser/metrics/user_metrics.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/common/jstemplate_builder.h"
+#include "chrome/common/url_constants.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/tab_contents/tab_contents.h"
+#include "grit/browser_resources.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
+#include "net/base/directory_lister.h"
+#include "net/base/escape.h"
+#include "ui/base/resource/resource_bundle.h"
+
+static const char kPropertyPath[] = "path";
+static const char kPropertyTitle[] = "title";
+static const char kPropertyOffset[] = "currentOffset";
+static const char kPropertyDirectory[] = "isDirectory";
+
+class SlideshowUIHTMLSource : public ChromeURLDataManager::DataSource {
+ public:
+  SlideshowUIHTMLSource();
+
+  // Called when the network layer has requested a resource underneath
+  // the path we registered.
+  virtual void StartDataRequest(const std::string& path,
+                                bool is_incognito,
+                                int request_id);
+  virtual std::string GetMimeType(const std::string&) const {
+    return "text/html";
+  }
+
+ private:
+  ~SlideshowUIHTMLSource() {}
+
+  DISALLOW_COPY_AND_ASSIGN(SlideshowUIHTMLSource);
+};
+
+// The handler for Javascript messages related to the "slideshow" view.
+class SlideshowHandler : public net::DirectoryLister::DirectoryListerDelegate,
+                         public WebUIMessageHandler,
+                         public base::SupportsWeakPtr<SlideshowHandler> {
+ public:
+  SlideshowHandler();
+  virtual ~SlideshowHandler();
+
+  // Init work after Attach.
+  void Init();
+
+  // DirectoryLister::DirectoryListerDelegate methods:
+  virtual void OnListFile(
+      const net::DirectoryLister::DirectoryListerData& data);
+  virtual void OnListDone(int error);
+
+  // WebUIMessageHandler implementation.
+  virtual WebUIMessageHandler* Attach(WebUI* web_ui);
+  virtual void RegisterMessages();
+
+  void GetChildrenForPath(const FilePath& path, bool is_refresh);
+
+  // Callback for the "getChildren" message.
+  void HandleGetChildren(const ListValue* args);
+
+  void HandleRefreshDirectory(const ListValue* args);
+
+ private:
+  bool PathIsImageFile(const char* filename);
+
+  scoped_ptr<ListValue> filelist_value_;
+  FilePath currentpath_;
+  FilePath originalpath_;
+  Profile* profile_;
+  int counter_;
+  int currentOffset_;
+  scoped_refptr<net::DirectoryLister> lister_;
+  bool is_refresh_;
+
+  DISALLOW_COPY_AND_ASSIGN(SlideshowHandler);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// SlideshowHTMLSource
+//
+////////////////////////////////////////////////////////////////////////////////
+
+SlideshowUIHTMLSource::SlideshowUIHTMLSource()
+    : DataSource(chrome::kChromeUISlideshowHost, MessageLoop::current()) {
+}
+
+void SlideshowUIHTMLSource::StartDataRequest(const std::string& path,
+                                              bool is_incognito,
+                                              int request_id) {
+  DictionaryValue localized_strings;
+  // TODO(dhg): Add stirings to localized strings, also add more strings
+  // that are currently hardcoded.
+  SetFontAndTextDirection(&localized_strings);
+
+  static const base::StringPiece slideshow_html(
+      ResourceBundle::GetSharedInstance().GetRawDataResource(
+          IDR_SLIDESHOW_HTML));
+  const std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
+      slideshow_html, &localized_strings);
+
+  scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
+  html_bytes->data.resize(full_html.size());
+  std::copy(full_html.begin(), full_html.end(), html_bytes->data.begin());
+
+  SendResponse(request_id, html_bytes);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// SlideshowHandler
+//
+////////////////////////////////////////////////////////////////////////////////
+SlideshowHandler::SlideshowHandler()
+    : profile_(NULL),
+      is_refresh_(false) {
+  lister_ = NULL;
+}
+
+SlideshowHandler::~SlideshowHandler() {
+  if (lister_.get()) {
+    lister_->Cancel();
+    lister_->set_delegate(NULL);
+  }
+}
+
+WebUIMessageHandler* SlideshowHandler::Attach(WebUI* web_ui) {
+  profile_ = web_ui->GetProfile();
+  // Create our favicon data source.
+  profile_->GetChromeURLDataManager()->AddDataSource(
+      new FaviconSource(profile_, FaviconSource::FAVICON));
+  return WebUIMessageHandler::Attach(web_ui);
+}
+
+void SlideshowHandler::Init() {
+}
+
+void SlideshowHandler::RegisterMessages() {
+  web_ui_->RegisterMessageCallback("getChildren",
+      NewCallback(this, &SlideshowHandler::HandleGetChildren));
+  web_ui_->RegisterMessageCallback("refreshDirectory",
+      NewCallback(this, &SlideshowHandler::HandleRefreshDirectory));
+}
+
+void SlideshowHandler::HandleRefreshDirectory(const ListValue* args) {
+#if defined(OS_CHROMEOS)
+  std::string path = UTF16ToUTF8(ExtractStringValue(args));
+  GetChildrenForPath(FilePath(path), true);
+#endif
+}
+
+void SlideshowHandler::GetChildrenForPath(const FilePath& path,
+                                          bool is_refresh) {
+  filelist_value_.reset(new ListValue());
+  currentpath_ = path;
+
+  if (lister_.get()) {
+    lister_->Cancel();
+    lister_->set_delegate(NULL);
+    lister_ = NULL;
+  }
+
+  is_refresh_ = is_refresh;
+  if (file_util::EnsureEndsWithSeparator(&currentpath_) &&
+      currentpath_.IsAbsolute()) {
+    lister_ = new net::DirectoryLister(currentpath_, this);
+  } else {
+    originalpath_ = currentpath_;
+    currentpath_ = currentpath_.DirName();
+    lister_ = new net::DirectoryLister(currentpath_, this);
+  }
+  counter_ = 0;
+  currentOffset_ = -1;
+  lister_->Start();
+}
+
+void SlideshowHandler::HandleGetChildren(const ListValue* args) {
+#if defined(OS_CHROMEOS)
+  filelist_value_.reset(new ListValue());
+  std::string path = UTF16ToUTF8(ExtractStringValue(args));
+  GetChildrenForPath(FilePath(path), false);
+#endif
+}
+
+bool SlideshowHandler::PathIsImageFile(const char* filename) {
+#if defined(OS_CHROMEOS)
+  FilePath file = FilePath(filename);
+  std::string ext = file.Extension();
+  ext = StringToLowerASCII(ext);
+  if (ext == ".jpg" ||
+      ext == ".jpeg" ||
+      ext == ".png" ||
+      ext == ".gif") {
+    return true;
+  } else {
+    return false;
+  }
+#else
+  return false;
+#endif
+}
+
+void SlideshowHandler::OnListFile(
+    const net::DirectoryLister::DirectoryListerData& data) {
+#if defined(OS_CHROMEOS)
+  if (data.info.filename[0] == '.') {
+    return;
+  }
+  if (!PathIsImageFile(data.info.filename.c_str())) {
+    return;
+  }
+
+  DictionaryValue* file_value = new DictionaryValue();
+
+  file_value->SetString(kPropertyTitle, data.info.filename);
+  file_value->SetString(kPropertyPath,
+                        currentpath_.Append(data.info.filename).value());
+  file_value->SetBoolean(kPropertyDirectory, S_ISDIR(data.info.stat.st_mode));
+  filelist_value_->Append(file_value);
+  std::string val;
+  file_value->GetString(kPropertyTitle, &val);
+  if (val == originalpath_.BaseName().value()) {
+    currentOffset_ = counter_;
+  }
+  counter_++;
+#endif
+}
+
+void SlideshowHandler::OnListDone(int error) {
+  DictionaryValue info_value;
+  counter_ = 0;
+  if (!(file_util::EnsureEndsWithSeparator(&originalpath_) &&
+        originalpath_.IsAbsolute()) &&
+      currentOffset_ != -1) {
+    info_value.SetInteger(kPropertyOffset, currentOffset_);
+  }
+  if (is_refresh_) {
+    info_value.SetString("functionCall", "refresh");
+  } else {
+    info_value.SetString("functionCall", "getChildren");
+  }
+  info_value.SetString(kPropertyPath, currentpath_.value());
+  web_ui_->CallJavascriptFunction("browseFileResult",
+                                  info_value, *(filelist_value_.get()));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// SlideshowUI
+//
+////////////////////////////////////////////////////////////////////////////////
+
+SlideshowUI::SlideshowUI(TabContents* contents) : WebUI(contents) {
+  SlideshowHandler* handler = new SlideshowHandler();
+  AddMessageHandler((handler)->Attach(this));
+  handler->Init();
+  SlideshowUIHTMLSource* html_source = new SlideshowUIHTMLSource();
+
+  // Set up the chrome://slideshow/ source.
+  contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+}

chrome/browser/ui/webui/slideshow_ui.h

+// Copyright (c) 2011 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.
+
+#ifndef CHROME_BROWSER_UI_WEBUI_SLIDESHOW_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_SLIDESHOW_UI_H_
+#pragma once
+
+#include "content/browser/webui/web_ui.h"
+
+class SlideshowUI : public WebUI {
+ public:
+  explicit SlideshowUI(TabContents* contents);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SlideshowUI);
+};
+
+#endif  // CHROME_BROWSER_UI_WEBUI_SLIDESHOW_UI_H_

chrome/chrome_browser.gypi

@@ -3357,6 +3357,8 @@
         'browser/ui/webui/shared_resources_data_source.h',
         'browser/ui/webui/shown_sections_handler.cc',
         'browser/ui/webui/shown_sections_handler.h',
+        'browser/ui/webui/slideshow_ui.cc',
+        'browser/ui/webui/slideshow_ui.h',
         'browser/ui/webui/sync_internals_html_source.cc',
         'browser/ui/webui/sync_internals_html_source.h',
         'browser/ui/webui/sync_internals_ui.cc',
@@ -3465,6 +3467,7 @@
             ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.cc'],
             ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.h'],
             ['exclude', 'browser/ui/webui/mediaplayer_ui.cc'],
+            ['exclude', 'browser/ui/webui/slideshow_ui.cc'],
             ['exclude', 'browser/extensions/extension_file_browser_private_api.cc'],
             ['exclude', 'browser/extensions/extension_file_browser_private_api.h'],
           ],