summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-06 18:06:59 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-06 18:06:59 +0000
commitcd405660a90adcf24e7cb204e28d6dfa3a7ea487 (patch)
tree0b65560d47ee3ec530883f3d58a894bc46cdec9b /chrome
parent20ac3c34782bd506cd88e1ed8a354d05956b1063 (diff)
downloadchromium_src-cd405660a90adcf24e7cb204e28d6dfa3a7ea487.zip
chromium_src-cd405660a90adcf24e7cb204e28d6dfa3a7ea487.tar.gz
chromium_src-cd405660a90adcf24e7cb204e28d6dfa3a7ea487.tar.bz2
Carnitas: Move file_metadata out of browser/ui/cocoa
file_metadata.h is being used by cross platform code outside of browser/ui. Since file_metadata.h doesn't have UI code it should be OK to move it out of browser/ui/cocoa. BUG=None TEST=Compiled git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/cocoa/file_metadata.h (renamed from chrome/browser/ui/cocoa/file_metadata.h)6
-rw-r--r--chrome/browser/cocoa/file_metadata.mm (renamed from chrome/browser/ui/cocoa/file_metadata.mm)2
-rw-r--r--chrome/browser/download/base_file.cc2
-rw-r--r--chrome/chrome_browser.gypi4
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/ui/cocoa/file_metadata.h b/chrome/browser/cocoa/file_metadata.h
index 2a6cfc5..e7448d7 100644
--- a/chrome/browser/ui/cocoa/file_metadata.h
+++ b/chrome/browser/cocoa/file_metadata.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_UI_COCOA_FILE_METADATA_H_
-#define CHROME_BROWSER_UI_COCOA_FILE_METADATA_H_
+#ifndef CHROME_BROWSER_COCOA_FILE_METADATA_H_
+#define CHROME_BROWSER_COCOA_FILE_METADATA_H_
#pragma once
class FilePath;
@@ -26,4 +26,4 @@ void AddQuarantineMetadataToFile(const FilePath& file, const GURL& source,
} // namespace file_metadata
-#endif // CHROME_BROWSER_UI_COCOA_FILE_METADATA_H_
+#endif // CHROME_BROWSER_COCOA_FILE_METADATA_H_
diff --git a/chrome/browser/ui/cocoa/file_metadata.mm b/chrome/browser/cocoa/file_metadata.mm
index c069f09..e484682 100644
--- a/chrome/browser/ui/cocoa/file_metadata.mm
+++ b/chrome/browser/cocoa/file_metadata.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/ui/cocoa/file_metadata.h"
+#include "chrome/browser/cocoa/file_metadata.h"
#include <ApplicationServices/ApplicationServices.h>
#include <Foundation/Foundation.h>
diff --git a/chrome/browser/download/base_file.cc b/chrome/browser/download/base_file.cc
index f62d93c..1fcf278 100644
--- a/chrome/browser/download/base_file.cc
+++ b/chrome/browser/download/base_file.cc
@@ -16,7 +16,7 @@
#if defined(OS_WIN)
#include "chrome/common/win_safe_util.h"
#elif defined(OS_MACOSX)
-#include "chrome/browser/ui/cocoa/file_metadata.h"
+#include "chrome/browser/cocoa/file_metadata.h"
#endif
BaseFile::BaseFile(const FilePath& full_path,
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d6cb3d1..f3d4f61 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -768,6 +768,8 @@
'browser/clipboard_dispatcher_win.cc',
'browser/cocoa/authorization_util.h',
'browser/cocoa/authorization_util.mm',
+ 'browser/cocoa/file_metadata.h',
+ 'browser/cocoa/file_metadata.mm',
'browser/cocoa/install_from_dmg.h',
'browser/cocoa/install_from_dmg.mm',
'browser/cocoa/keystone_glue.h',
@@ -2246,8 +2248,6 @@
'browser/ui/cocoa/external_protocol_dialog.mm',
'browser/ui/cocoa/fast_resize_view.h',
'browser/ui/cocoa/fast_resize_view.mm',
- 'browser/ui/cocoa/file_metadata.h',
- 'browser/ui/cocoa/file_metadata.mm',
'browser/ui/cocoa/find_bar/find_bar_bridge.h',
'browser/ui/cocoa/find_bar/find_bar_bridge.mm',
'browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h',