Add IsBootPath to MountLibrary. Additional boot path check in imageburner so ...

chrome/browser/chromeos/dom_ui/imageburner_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_CHROMEOS_DOM_UI_IMAGEBURNER_UI_H_
 #define CHROME_BROWSER_CHROMEOS_DOM_UI_IMAGEBURNER_UI_H_
 
 #include <string>
 #include <vector>
@@ skipping 16 matching lines @@
 #include "ui/base/dragdrop/download_file_interface.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
 static const std::string kPropertyPath = "path";
 static const std::string kPropertyTitle = "title";
 static const std::string kPropertyDirectory = "isDirectory";
 static const std::string kImageBaseURL =
     "http://chrome-master.mtv.corp.google.com/chromeos/dev-channel/";
 static const std::string kImageFetcherName = "LATEST-x86-generic";
-static const std::string kImageFileName = "chromeos_image.bin.gz";
+static const std::string kImageDownloadURL =
+    "https://dl.google.com/dl/chromeos/recovery/latest_mario_beta_channel";
+static const std::string kImageFileName = "chromeos_image.bin.zip";
 static const std::string kTempImageFolderName = "chromeos_image";

[xiyuan, 2011/01/25 17:28:30]

Since you touch this file, could we get rid of the those std::string and move
them into cc file? It looks like const char [] should be good enough for those
consts and does not need to live in the header file.

[achuithb, 2011/01/25 22:21:45]

Good point - moved them to .cc. It's convenient for some of these to be
std::string because they are used in string context - otherwise I'd need to
create a tmp string object each time. The rest I've converted to const char*
const.

 
 class ImageBurnResourceManager;
 class TabContents;
 
-class ImageBurnUIHTMLSource : public ChromeURLDataManager::DataSource {
- public:
-  ImageBurnUIHTMLSource();
-
-  // Called when the network layer has requested a resource underneath
-  // the path we registered.
-  virtual void StartDataRequest(const std::string& path,
-                                 bool is_off_the_record,
-                                 int request_id);
-  virtual std::string GetMimeType(const std::string&) const {
-    return "text/html";
-  }
-
- private:
-  ~ImageBurnUIHTMLSource() {}
-
-  DISALLOW_COPY_AND_ASSIGN(ImageBurnUIHTMLSource);
-};
-
 class ImageBurnHandler : public DOMMessageHandler,
                          public chromeos::MountLibrary::Observer,
                          public chromeos::BurnLibrary::Observer,
                          public DownloadManager::Observer,
                          public DownloadItem::Observer,
                          public base::SupportsWeakPtr<ImageBurnHandler> {
  public:
   explicit ImageBurnHandler(TabContents* contents);
   virtual ~ImageBurnHandler();
 
@@ skipping 58 matching lines @@
   DownloadManager* download_manager_;
   bool download_item_observer_added_;
   DownloadItem*  active_download_item_;
   ImageBurnResourceManager* burn_resource_manager_;
 
   friend class ImageBurnTaskProxy;
 
   DISALLOW_COPY_AND_ASSIGN(ImageBurnHandler);
 };
 
-class ImageBurnTaskProxy
-    : public base::RefCountedThreadSafe<ImageBurnTaskProxy> {
- public:
-  explicit ImageBurnTaskProxy(const base::WeakPtr<ImageBurnHandler>& handler);
-
-  bool ReportDownloadInitialized();
-  bool CheckDownloadFinished();
-  void BurnImage();
-  void FinalizeBurn(bool success);
-
-  void CreateImageUrl(TabContents* tab_contents, ImageBurnHandler* downloader);
-
- private:
-  base::WeakPtr<ImageBurnHandler> handler_;
-  ImageBurnResourceManager* resource_manager_;
-
-  friend class base::RefCountedThreadSafe<ImageBurnTaskProxy>;
-
-  DISALLOW_COPY_AND_ASSIGN(ImageBurnTaskProxy);
-};
-
 class ImageBurnResourceManager : public DownloadManager::Observer,
                                  public DownloadItem::Observer {
  public:
   // Returns the singleton instance.
   static ImageBurnResourceManager* GetInstance();
 
   // DownloadItem::Observer interface
   virtual void OnDownloadUpdated(DownloadItem* download);
   virtual void OnDownloadFileCompleted(DownloadItem* download);
   virtual void OnDownloadOpened(DownloadItem* download);
@@ skipping 46 matching lines @@
 };
 
 class ImageBurnUI : public DOMUI {
  public:
   explicit ImageBurnUI(TabContents* contents);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ImageBurnUI);
 };
 #endif  // CHROME_BROWSER_CHROMEOS_DOM_UI_IMAGEBURNER_UI_H_