diff options
-rw-r--r-- | chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm | 4 | ||||
-rw-r--r-- | chrome/browser/ui/gtk/tab_contents_drag_source.cc | 4 | ||||
-rw-r--r-- | chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc | 4 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 4 | ||||
-rw-r--r-- | content/browser/download/drag_download_file.cc (renamed from chrome/browser/download/drag_download_file.cc) | 4 | ||||
-rw-r--r-- | content/browser/download/drag_download_file.h (renamed from chrome/browser/download/drag_download_file.h) | 6 | ||||
-rw-r--r-- | content/browser/download/drag_download_util.cc (renamed from chrome/browser/download/drag_download_util.cc) | 2 | ||||
-rw-r--r-- | content/browser/download/drag_download_util.h (renamed from chrome/browser/download/drag_download_util.h) | 8 | ||||
-rw-r--r-- | content/content_browser.gypi | 4 |
9 files changed, 20 insertions, 20 deletions
diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm index b7300ee..b962489 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm +++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm @@ -16,10 +16,10 @@ #import "chrome/app/breakpad_mac.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_util.h" -#include "chrome/browser/download/drag_download_file.h" -#include "chrome/browser/download/drag_download_util.h" #include "chrome/browser/tab_contents/tab_contents_view_mac.h" #include "content/browser/download/download_manager.h" +#include "content/browser/download/drag_download_file.h" +#include "content/browser/download/drag_download_util.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/url_constants.h" diff --git a/chrome/browser/ui/gtk/tab_contents_drag_source.cc b/chrome/browser/ui/gtk/tab_contents_drag_source.cc index 5cff95c..28d4ecd 100644 --- a/chrome/browser/ui/gtk/tab_contents_drag_source.cc +++ b/chrome/browser/ui/gtk/tab_contents_drag_source.cc @@ -11,9 +11,9 @@ #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/download_util.h" -#include "chrome/browser/download/drag_download_file.h" -#include "chrome/browser/download/drag_download_util.h" #include "chrome/browser/ui/gtk/gtk_util.h" +#include "content/browser/download/drag_download_file.h" +#include "content/browser/download/drag_download_util.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index c2e42c0..f011f17 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -16,14 +16,14 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/download/download_util.h" -#include "chrome/browser/download/drag_download_file.h" -#include "chrome/browser/download/drag_download_util.h" #include "chrome/browser/tab_contents/web_drag_source_win.h" #include "chrome/browser/tab_contents/web_drag_utils_win.h" #include "chrome/browser/tab_contents/web_drop_target_win.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" +#include "content/browser/download/drag_download_file.h" +#include "content/browser/download/drag_download_util.h" #include "content/browser/tab_contents/tab_contents.h" #include "net/base/net_util.h" #include "views/drag_utils.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 734c023..9d274e7 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -870,10 +870,6 @@ 'browser/download/download_throttling_resource_handler.h', 'browser/download/download_util.cc', 'browser/download/download_util.h', - 'browser/download/drag_download_file.cc', - 'browser/download/drag_download_file.h', - 'browser/download/drag_download_util.cc', - 'browser/download/drag_download_util.h', 'browser/download/save_package_file_picker.cc', 'browser/download/save_package_file_picker.h', 'browser/enumerate_modules_model_win.cc', diff --git a/chrome/browser/download/drag_download_file.cc b/content/browser/download/drag_download_file.cc index 55150d6..69ce7a1 100644 --- a/chrome/browser/download/drag_download_file.cc +++ b/content/browser/download/drag_download_file.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/download/drag_download_file.h" +#include "content/browser/download/drag_download_file.h" #include "base/file_util.h" #include "base/message_loop.h" -#include "chrome/browser/profiles/profile.h" +#include "content/browser/browser_context.h" #include "content/browser/browser_thread.h" #include "content/browser/download/download_item.h" #include "content/browser/download/download_stats.h" diff --git a/chrome/browser/download/drag_download_file.h b/content/browser/download/drag_download_file.h index af1bd92..621a368 100644 --- a/chrome/browser/download/drag_download_file.h +++ b/content/browser/download/drag_download_file.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_FILE_H_ -#define CHROME_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_FILE_H_ +#ifndef CONTENT_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_FILE_H_ +#define CONTENT_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_FILE_H_ #pragma once #include "base/file_path.h" @@ -112,4 +112,4 @@ class DragDownloadFile : public ui::DownloadFileProvider, DISALLOW_COPY_AND_ASSIGN(DragDownloadFile); }; -#endif // CHROME_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_FILE_H_ +#endif // CONTENT_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_FILE_H_ diff --git a/chrome/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc index b441c39..99d185a 100644 --- a/chrome/browser/download/drag_download_util.cc +++ b/content/browser/download/drag_download_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/download/drag_download_util.h" +#include "content/browser/download/drag_download_util.h" #include "base/string_util.h" #include "base/file_path.h" diff --git a/chrome/browser/download/drag_download_util.h b/content/browser/download/drag_download_util.h index 78ccbb5..7eef73f 100644 --- a/chrome/browser/download/drag_download_util.h +++ b/content/browser/download/drag_download_util.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_UTIL_H_ -#define CHROME_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_UTIL_H_ +#ifndef CONTENT_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_UTIL_H_ +#define CONTENT_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_UTIL_H_ #pragma once #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "chrome/browser/download/drag_download_file.h" +#include "content/browser/download/drag_download_file.h" #include "ui/base/dragdrop/download_file_interface.h" class FilePath; @@ -59,4 +59,4 @@ class PromiseFileFinalizer : public ui::DownloadFileObserver { } // namespace drag_download_util -#endif // CHROME_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_UTIL_H_ +#endif // CONTENT_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_UTIL_H_ diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 0f554c6..7f58d8e 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -133,6 +133,10 @@ 'browser/download/download_status_updater_delegate.h', 'browser/download/download_types.cc', 'browser/download/download_types.h', + 'browser/download/drag_download_file.cc', + 'browser/download/drag_download_file.h', + 'browser/download/drag_download_util.cc', + 'browser/download/drag_download_util.h', 'browser/download/mhtml_generation_manager.cc', 'browser/download/mhtml_generation_manager.h', 'browser/download/save_file.cc', |