summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/chrome_browser.gypi7
-rw-r--r--chrome/chrome_common.gypi2
-rw-r--r--content/browser/download/base_file.cc4
-rw-r--r--content/browser/download/base_file.h2
-rw-r--r--content/browser/file_metadata_mac.h (renamed from chrome/browser/mac/file_metadata.h)6
-rw-r--r--content/browser/file_metadata_mac.mm (renamed from chrome/browser/mac/file_metadata.mm)2
-rw-r--r--content/browser/power_save_blocker.h (renamed from chrome/browser/power_save_blocker.h)6
-rw-r--r--content/browser/power_save_blocker_common.cc (renamed from chrome/browser/power_save_blocker_common.cc)3
-rw-r--r--content/browser/power_save_blocker_mac.cc (renamed from chrome/browser/power_save_blocker_mac.cc)2
-rw-r--r--content/browser/power_save_blocker_stub.cc (renamed from chrome/browser/power_save_blocker_stub.cc)2
-rw-r--r--content/browser/power_save_blocker_win.cc (renamed from chrome/browser/power_save_blocker_win.cc)2
-rw-r--r--content/browser/safe_util_win.cc (renamed from chrome/common/win_safe_util.cc)2
-rw-r--r--content/browser/safe_util_win.h (renamed from chrome/common/win_safe_util.h)6
-rw-r--r--content/content_browser.gypi9
14 files changed, 28 insertions, 27 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e0671b8..afb8c08 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1347,8 +1347,6 @@
'browser/language_order_table_model.h',
'browser/mac/authorization_util.h',
'browser/mac/authorization_util.mm',
- 'browser/mac/file_metadata.h',
- 'browser/mac/file_metadata.mm',
'browser/mac/install_from_dmg.h',
'browser/mac/install_from_dmg.mm',
'browser/mac/keystone_glue.h',
@@ -1652,11 +1650,6 @@
'<(protoc_out_dir)/chrome/browser/policy/proto/device_management_local.pb.h',
'browser/possible_url_model.cc',
'browser/possible_url_model.h',
- 'browser/power_save_blocker.h',
- 'browser/power_save_blocker_common.cc',
- 'browser/power_save_blocker_mac.cc',
- 'browser/power_save_blocker_stub.cc',
- 'browser/power_save_blocker_win.cc',
'browser/preferences_mac.cc',
'browser/preferences_mac.h',
'browser/prefs/browser_prefs.cc',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 94b54b4..a6ddcd2 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -77,8 +77,6 @@
'common/switch_utils.h',
'common/time_format.cc',
'common/time_format.h',
- 'common/win_safe_util.cc',
- 'common/win_safe_util.h',
],
}],
],
diff --git a/content/browser/download/base_file.cc b/content/browser/download/base_file.cc
index 50f90b0..7593df8 100644
--- a/content/browser/download/base_file.cc
+++ b/content/browser/download/base_file.cc
@@ -16,9 +16,9 @@
#include "content/browser/browser_thread.h"
#if defined(OS_WIN)
-#include "chrome/common/win_safe_util.h"
+#include "content/browser/safe_util_win.h"
#elif defined(OS_MACOSX)
-#include "chrome/browser/mac/file_metadata.h"
+#include "content/browser/file_metadata_mac.h"
#endif
BaseFile::BaseFile(const FilePath& full_path,
diff --git a/content/browser/download/base_file.h b/content/browser/download/base_file.h
index 08f7c5e..d07fb1d 100644
--- a/content/browser/download/base_file.h
+++ b/content/browser/download/base_file.h
@@ -11,7 +11,7 @@
#include "base/file_path.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/power_save_blocker.h"
+#include "content/browser/power_save_blocker.h"
#include "googleurl/src/gurl.h"
namespace crypto {
diff --git a/chrome/browser/mac/file_metadata.h b/content/browser/file_metadata_mac.h
index 17a59e8..d33c25f 100644
--- a/chrome/browser/mac/file_metadata.h
+++ b/content/browser/file_metadata_mac.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_MAC_FILE_METADATA_H_
-#define CHROME_BROWSER_MAC_FILE_METADATA_H_
+#ifndef CONTENT_BROWSER_FILE_METADATA_MAC_H_
+#define CONTENT_BROWSER_FILE_METADATA_MAC_H_
#pragma once
class FilePath;
@@ -26,4 +26,4 @@ void AddQuarantineMetadataToFile(const FilePath& file, const GURL& source,
} // namespace file_metadata
-#endif // CHROME_BROWSER_MAC_FILE_METADATA_H_
+#endif // CONTENT_BROWSER_FILE_METADATA_MAC_H_
diff --git a/chrome/browser/mac/file_metadata.mm b/content/browser/file_metadata_mac.mm
index 2775259..953b063 100644
--- a/chrome/browser/mac/file_metadata.mm
+++ b/content/browser/file_metadata_mac.mm
@@ -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/mac/file_metadata.h"
+#include "content/browser/file_metadata_mac.h"
#include <ApplicationServices/ApplicationServices.h>
#include <Foundation/Foundation.h>
diff --git a/chrome/browser/power_save_blocker.h b/content/browser/power_save_blocker.h
index d8aa34c..7d04e6e 100644
--- a/chrome/browser/power_save_blocker.h
+++ b/content/browser/power_save_blocker.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_POWER_SAVE_BLOCKER_H_
-#define CHROME_BROWSER_POWER_SAVE_BLOCKER_H_
+#ifndef CONTENT_BROWSER_POWER_SAVE_BLOCKER_H_
+#define CONTENT_BROWSER_POWER_SAVE_BLOCKER_H_
#pragma once
#include "base/basictypes.h"
@@ -39,4 +39,4 @@ class PowerSaveBlocker {
DISALLOW_COPY_AND_ASSIGN(PowerSaveBlocker);
};
-#endif // CHROME_BROWSER_POWER_SAVE_BLOCKER_H_
+#endif // CONTENT_BROWSER_POWER_SAVE_BLOCKER_H_
diff --git a/chrome/browser/power_save_blocker_common.cc b/content/browser/power_save_blocker_common.cc
index 9fcfd7e..53aecd5 100644
--- a/chrome/browser/power_save_blocker_common.cc
+++ b/content/browser/power_save_blocker_common.cc
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/power_save_blocker.h"
+#include "content/browser/power_save_blocker.h"
+
#include "content/browser/browser_thread.h"
// Accessed only from the UI thread.
diff --git a/chrome/browser/power_save_blocker_mac.cc b/content/browser/power_save_blocker_mac.cc
index da48052..9acd130 100644
--- a/chrome/browser/power_save_blocker_mac.cc
+++ b/content/browser/power_save_blocker_mac.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/power_save_blocker.h"
+#include "content/browser/power_save_blocker.h"
#include <IOKit/pwr_mgt/IOPMLib.h>
diff --git a/chrome/browser/power_save_blocker_stub.cc b/content/browser/power_save_blocker_stub.cc
index 2c1a7e3..701d1e5 100644
--- a/chrome/browser/power_save_blocker_stub.cc
+++ b/content/browser/power_save_blocker_stub.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/power_save_blocker.h"
+#include "content/browser/power_save_blocker.h"
// Default, stub implementation, for platforms that don't have their own yet.
diff --git a/chrome/browser/power_save_blocker_win.cc b/content/browser/power_save_blocker_win.cc
index 318aa99..1ea3ac9 100644
--- a/chrome/browser/power_save_blocker_win.cc
+++ b/content/browser/power_save_blocker_win.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/power_save_blocker.h"
+#include "content/browser/power_save_blocker.h"
#include <windows.h>
diff --git a/chrome/common/win_safe_util.cc b/content/browser/safe_util_win.cc
index 2a5813a..7aa699f 100644
--- a/chrome/common/win_safe_util.cc
+++ b/content/browser/safe_util_win.cc
@@ -5,7 +5,7 @@
#include <shlobj.h>
#include <shobjidl.h>
-#include "chrome/common/win_safe_util.h"
+#include "content/browser/safe_util_win.h"
#include "base/file_path.h"
#include "base/logging.h"
diff --git a/chrome/common/win_safe_util.h b/content/browser/safe_util_win.h
index 424e8f8..ce561d70 100644
--- a/chrome/common/win_safe_util.h
+++ b/content/browser/safe_util_win.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_COMMON_WIN_SAFE_UTIL_H_
-#define CHROME_COMMON_WIN_SAFE_UTIL_H_
+#ifndef CONTENT_COMMON_SAFE_UTIL_WIN_H_
+#define CONTENT_COMMON_SAFE_UTIL_WIN_H_
#pragma once
#include <string>
@@ -53,4 +53,4 @@ bool SetInternetZoneIdentifier(const FilePath& full_path,
} // namespace win_util
-#endif // CHROME_COMMON_WIN_SAFE_UTIL_H_
+#endif // CONTENT_COMMON_SAFE_UTIL_WIN_H_
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 7ca81a9..37e20bd 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -104,6 +104,8 @@
'browser/download/save_package.h',
'browser/download/save_types.cc',
'browser/download/save_types.h',
+ 'browser/file_metadata_mac.h',
+ 'browser/file_metadata_mac.mm',
'browser/file_system/browser_file_system_helper.cc',
'browser/file_system/browser_file_system_helper.h',
'browser/file_system/file_system_dispatcher_host.cc',
@@ -228,6 +230,11 @@
'browser/net/url_request_slow_download_job.h',
'browser/net/url_request_slow_http_job.cc',
'browser/net/url_request_slow_http_job.h',
+ 'browser/power_save_blocker.h',
+ 'browser/power_save_blocker_common.cc',
+ 'browser/power_save_blocker_mac.cc',
+ 'browser/power_save_blocker_stub.cc',
+ 'browser/power_save_blocker_win.cc',
'browser/ppapi_plugin_process_host.cc',
'browser/ppapi_plugin_process_host.h',
'browser/ppapi_broker_process_host.cc',
@@ -363,6 +370,8 @@
'browser/resolve_proxy_msg_helper.h',
'browser/resource_context.cc',
'browser/resource_context.h',
+ 'browser/safe_util_win.cc',
+ 'browser/safe_util_win.h',
'browser/site_instance.cc',
'browser/site_instance.h',
'browser/speech/audio_encoder.cc',
generated by cgit v1.1 at 2025-01-12 02:52:14 +0000