previous rebase work from Cheng

rogerwang · rogerwang · commit 1c8b3913cd01 · 2013-01-09T10:00:28.000+08:00
diff --git a/src/browser/native_window.cc b/src/browser/native_window.cc
@@ -85,10 +85,7 @@ void NativeWindow::InitFromManifest(base::DictionaryValue* manifest) {
   std::string position;
   if (manifest->GetInteger(switches::kmX, &x) &&
       manifest->GetInteger(switches::kmY, &y)) {
-    int width, height;
-    manifest->GetInteger(switches::kmWidth, &width);
-    manifest->GetInteger(switches::kmHeight, &height);
-    Move(gfx::Rect(x, y, width, height));
+    SetPosition(gfx::Point(x, y));
   } else if (manifest->GetString(switches::kmPosition, &position)) {
     SetPosition(position);
   }
diff --git a/src/browser/shell_download_manager_delegate.cc b/src/browser/shell_download_manager_delegate.cc
@@ -45,8 +45,7 @@ namespace content {
 
 ShellDownloadManagerDelegate::ShellDownloadManagerDelegate()
     : download_manager_(NULL),
-      suppress_prompting_(false),
-      last_download_db_handle_(DownloadItem::kUninitializedHandle) {
+      suppress_prompting_(false) {
   // Balanced in Shutdown();
   AddRef();
 }
@@ -197,12 +196,6 @@ void ShellDownloadManagerDelegate::ChooseDownloadPath(
                DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, result);
 }
 
-void ShellDownloadManagerDelegate::AddItemToPersistentStore(
-    DownloadItem* item) {
-  download_manager_->OnItemAddedToPersistentStore(
-      item->GetId(), --last_download_db_handle_);
-}
-
 void ShellDownloadManagerDelegate::SetDownloadBehaviorForTesting(
     const FilePath& default_download_path) {
   default_download_path_ = default_download_path;
diff --git a/src/browser/shell_download_manager_delegate.h b/src/browser/shell_download_manager_delegate.h
@@ -41,16 +41,18 @@ class ShellDownloadManagerDelegate
   virtual bool DetermineDownloadTarget(
       DownloadItem* download,
       const DownloadTargetCallback& callback) OVERRIDE;
-  virtual void AddItemToPersistentStore(DownloadItem* item) OVERRIDE;
 
   // Inhibits prompting and sets the default download path.
   void SetDownloadBehaviorForTesting(
       const FilePath& default_download_path);
 
+ protected:
+  // To allow subclasses for testing.
+  virtual ~ShellDownloadManagerDelegate();
+
  private:
   friend class base::RefCountedThreadSafe<ShellDownloadManagerDelegate>;
 
-  virtual ~ShellDownloadManagerDelegate();
 
   void GenerateFilename(int32 download_id,
                         const DownloadTargetCallback& callback,
@@ -66,7 +68,6 @@ class ShellDownloadManagerDelegate
   DownloadManager* download_manager_;
   FilePath default_download_path_;
   bool suppress_prompting_;
-  int64 last_download_db_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellDownloadManagerDelegate);
 };
diff --git a/src/common/gpu_internals.cc b/src/common/gpu_internals.cc
@@ -20,6 +20,7 @@
 
 #include "content/nw/src/common/gpu_internals.h"
 
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/src/media/media_internals.h b/src/media/media_internals.h
@@ -57,6 +57,10 @@ class MediaInternals : public content::MediaObserver {
       int render_process_id,
       int render_view_id,
       const content::MediaStreamDevices& devices) OVERRIDE;
+  virtual void OnAudioCaptureDevicesChanged(
+      const content::MediaStreamDevices& devices) OVERRIDE {}
+  virtual void OnVideoCaptureDevicesChanged(
+      const content::MediaStreamDevices& devices) OVERRIDE {}
   virtual void OnMediaRequestStateChanged(
       int render_process_id,
       int render_view_id,
diff --git a/src/nw_package.cc b/src/nw_package.cc
@@ -25,7 +25,7 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
@@ -332,7 +332,7 @@ bool Package::ExtractPath() {
 
 bool Package::ExtractPackage(const FilePath& zip_file, FilePath* where) {
   // Auto clean our temporary directory
-  static scoped_ptr<ScopedTempDir> scoped_temp_dir;
+  static scoped_ptr<base::ScopedTempDir> scoped_temp_dir;
 
 #if defined(OS_WIN)
   if (!file_util::CreateNewTempDirectory(L"nw", where)) {
@@ -344,7 +344,7 @@ bool Package::ExtractPackage(const FilePath& zip_file, FilePath* where) {
     return false;
   }
 
-  scoped_temp_dir.reset(new ScopedTempDir());
+  scoped_temp_dir.reset(new base::ScopedTempDir());
   if (!scoped_temp_dir->Set(*where)) {
     ReportError("Cannot extract package",
                 "Unable to set temporary directory.");
diff --git a/src/shell_browser_context.h b/src/shell_browser_context.h
@@ -7,9 +7,9 @@
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
 #include "content/public/browser/browser_context.h"
 
 namespace nw {
@@ -64,7 +64,7 @@ class ShellBrowserContext : public BrowserContext {
                                    // temporarily
   bool off_the_record_;
   nw::Package* package_;
-  ScopedTempDir testing_path_;
+  base::ScopedTempDir testing_path_;
   FilePath path_;
   scoped_ptr<ResourceContext> resource_context_;
   scoped_refptr<ShellDownloadManagerDelegate> download_manager_delegate_;
