summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/cocoa/bookmark_bar_view.mm2
-rw-r--r--chrome/browser/cocoa/bookmark_folder_target.mm2
-rw-r--r--chrome/browser/cocoa/location_bar_view_mac.mm2
-rw-r--r--chrome/browser/cocoa/url_drop_target.mm2
-rw-r--r--chrome/browser/cocoa/web_drag_source.mm2
-rw-r--r--chrome/browser/cocoa/web_drop_target.mm2
-rw-r--r--chrome/browser/cocoa/web_drop_target_unittest.mm2
-rw-r--r--chrome/browser/shell_integration_mac.mm2
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_mac.mm2
-rw-r--r--chrome/chrome_browser.gypi20
-rw-r--r--third_party/mozilla/NSPasteboard+Utils.h (renamed from third_party/mozilla/include/NSPasteboard+Utils.h)0
-rw-r--r--third_party/mozilla/NSPasteboard+Utils.mm (renamed from third_party/mozilla/include/NSPasteboard+Utils.mm)0
-rw-r--r--third_party/mozilla/NSScreen+Utils.h (renamed from third_party/mozilla/include/NSScreen+Utils.h)0
-rw-r--r--third_party/mozilla/NSScreen+Utils.m (renamed from third_party/mozilla/include/NSScreen+Utils.m)0
-rw-r--r--third_party/mozilla/NSString+Utils.h (renamed from third_party/mozilla/include/NSString+Utils.h)0
-rw-r--r--third_party/mozilla/NSString+Utils.m (renamed from third_party/mozilla/include/NSString+Utils.m)0
-rw-r--r--third_party/mozilla/NSURL+Utils.h (renamed from third_party/mozilla/include/NSURL+Utils.h)0
-rw-r--r--third_party/mozilla/NSURL+Utils.m (renamed from third_party/mozilla/include/NSURL+Utils.m)0
-rw-r--r--third_party/mozilla/NSWorkspace+Utils.h (renamed from third_party/mozilla/include/NSWorkspace+Utils.h)0
-rw-r--r--third_party/mozilla/NSWorkspace+Utils.m (renamed from third_party/mozilla/include/NSWorkspace+Utils.m)0
-rw-r--r--third_party/mozilla/README.chromium (renamed from third_party/mozilla/include/README.chromium)0
-rw-r--r--webkit/glue/plugins/DEPS3
22 files changed, 19 insertions, 22 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_view.mm b/chrome/browser/cocoa/bookmark_bar_view.mm
index 75ef48d..c66348e 100644
--- a/chrome/browser/cocoa/bookmark_bar_view.mm
+++ b/chrome/browser/cocoa/bookmark_bar_view.mm
@@ -8,7 +8,7 @@
#import "chrome/browser/cocoa/bookmark_bar_controller.h"
#import "chrome/browser/cocoa/bookmark_button.h"
#import "chrome/browser/cocoa/themed_window.h"
-#import "third_party/mozilla/include/NSPasteboard+Utils.h"
+#import "third_party/mozilla/NSPasteboard+Utils.h"
@interface BookmarkBarView (Private)
- (void)themeDidChangeNotification:(NSNotification*)aNotification;
diff --git a/chrome/browser/cocoa/bookmark_folder_target.mm b/chrome/browser/cocoa/bookmark_folder_target.mm
index fdaa125..57cb7f9 100644
--- a/chrome/browser/cocoa/bookmark_folder_target.mm
+++ b/chrome/browser/cocoa/bookmark_folder_target.mm
@@ -10,7 +10,7 @@
#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h"
#import "chrome/browser/cocoa/bookmark_button.h"
#import "chrome/browser/cocoa/event_utils.h"
-#import "third_party/mozilla/include/NSPasteboard+Utils.h"
+#import "third_party/mozilla/NSPasteboard+Utils.h"
NSString* kBookmarkButtonDragType = @"ChromiumBookmarkButtonDragType";
diff --git a/chrome/browser/cocoa/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar_view_mac.mm
index 9c16199..ef2ce52 100644
--- a/chrome/browser/cocoa/location_bar_view_mac.mm
+++ b/chrome/browser/cocoa/location_bar_view_mac.mm
@@ -41,7 +41,7 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "skia/ext/skia_utils_mac.h"
-#import "third_party/mozilla/include/NSPasteboard+Utils.h"
+#import "third_party/mozilla/NSPasteboard+Utils.h"
// TODO(shess): This code is mostly copied from the gtk
diff --git a/chrome/browser/cocoa/url_drop_target.mm b/chrome/browser/cocoa/url_drop_target.mm
index 296b8d1..dfcd99b 100644
--- a/chrome/browser/cocoa/url_drop_target.mm
+++ b/chrome/browser/cocoa/url_drop_target.mm
@@ -5,7 +5,7 @@
#import "chrome/browser/cocoa/url_drop_target.h"
#include "base/logging.h"
-#import "third_party/mozilla/include/NSPasteboard+Utils.h"
+#import "third_party/mozilla/NSPasteboard+Utils.h"
@interface URLDropTargetHandler(Private)
diff --git a/chrome/browser/cocoa/web_drag_source.mm b/chrome/browser/cocoa/web_drag_source.mm
index 62733bc..70c144c 100644
--- a/chrome/browser/cocoa/web_drag_source.mm
+++ b/chrome/browser/cocoa/web_drag_source.mm
@@ -20,7 +20,7 @@
#include "chrome/browser/tab_contents/tab_contents_view_mac.h"
#include "net/base/file_stream.h"
#include "net/base/net_util.h"
-#import "third_party/mozilla/include/NSPasteboard+Utils.h"
+#import "third_party/mozilla/NSPasteboard+Utils.h"
#include "webkit/glue/webdropdata.h"
using base::SysNSStringToUTF8;
diff --git a/chrome/browser/cocoa/web_drop_target.mm b/chrome/browser/cocoa/web_drop_target.mm
index b051772..6ee1874 100644
--- a/chrome/browser/cocoa/web_drop_target.mm
+++ b/chrome/browser/cocoa/web_drop_target.mm
@@ -9,7 +9,7 @@
#include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#import "third_party/mozilla/include/NSPasteboard+Utils.h"
+#import "third_party/mozilla/NSPasteboard+Utils.h"
#include "webkit/glue/webdropdata.h"
#include "webkit/glue/window_open_disposition.h"
diff --git a/chrome/browser/cocoa/web_drop_target_unittest.mm b/chrome/browser/cocoa/web_drop_target_unittest.mm
index 3db4777..1df01441 100644
--- a/chrome/browser/cocoa/web_drop_target_unittest.mm
+++ b/chrome/browser/cocoa/web_drop_target_unittest.mm
@@ -8,7 +8,7 @@
#import "chrome/browser/cocoa/web_drop_target.h"
#include "chrome/browser/renderer_host/test/test_render_view_host.h"
#include "testing/gtest/include/gtest/gtest.h"
-#import "third_party/mozilla/include/NSPasteboard+Utils.h"
+#import "third_party/mozilla/NSPasteboard+Utils.h"
#include "webkit/glue/webdropdata.h"
class WebDropTargetTest : public RenderViewHostTestHarness {
diff --git a/chrome/browser/shell_integration_mac.mm b/chrome/browser/shell_integration_mac.mm
index 8b10fc1a..035507b 100644
--- a/chrome/browser/shell_integration_mac.mm
+++ b/chrome/browser/shell_integration_mac.mm
@@ -5,7 +5,7 @@
#include "chrome/browser/shell_integration.h"
#include "base/mac_util.h"
-#import "third_party/mozilla/include/NSWorkspace+Utils.h"
+#import "third_party/mozilla/NSWorkspace+Utils.h"
// Sets Chromium as default browser (only for current user). Returns false if
// this operation fails (which we can't check for).
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index 23cfdf6..65b27f5 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -27,7 +27,7 @@
#include "chrome/common/notification_service.h"
#include "chrome/common/render_messages.h"
#include "skia/ext/skia_utils_mac.h"
-#import "third_party/mozilla/include/NSPasteboard+Utils.h"
+#import "third_party/mozilla/NSPasteboard+Utils.h"
using WebKit::WebDragOperation;
using WebKit::WebDragOperationsMask;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b317623..81aea45 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2594,16 +2594,16 @@
'../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.h',
'../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.m',
# Build necessary Mozilla sources
- '../third_party/mozilla/include/NSPasteboard+Utils.h',
- '../third_party/mozilla/include/NSPasteboard+Utils.mm',
- '../third_party/mozilla/include/NSScreen+Utils.h',
- '../third_party/mozilla/include/NSScreen+Utils.m',
- '../third_party/mozilla/include/NSString+Utils.h',
- '../third_party/mozilla/include/NSString+Utils.m',
- '../third_party/mozilla/include/NSURL+Utils.h',
- '../third_party/mozilla/include/NSURL+Utils.m',
- '../third_party/mozilla/include/NSWorkspace+Utils.h',
- '../third_party/mozilla/include/NSWorkspace+Utils.m',
+ '../third_party/mozilla/NSPasteboard+Utils.h',
+ '../third_party/mozilla/NSPasteboard+Utils.mm',
+ '../third_party/mozilla/NSScreen+Utils.h',
+ '../third_party/mozilla/NSScreen+Utils.m',
+ '../third_party/mozilla/NSString+Utils.h',
+ '../third_party/mozilla/NSString+Utils.m',
+ '../third_party/mozilla/NSURL+Utils.h',
+ '../third_party/mozilla/NSURL+Utils.m',
+ '../third_party/mozilla/NSWorkspace+Utils.h',
+ '../third_party/mozilla/NSWorkspace+Utils.m',
# Headers so that IB can find classes it needs to resolve classes
# in XIB files.
'../base/chrome_application_mac.h',
diff --git a/third_party/mozilla/include/NSPasteboard+Utils.h b/third_party/mozilla/NSPasteboard+Utils.h
index 5c2f1e1..5c2f1e1 100644
--- a/third_party/mozilla/include/NSPasteboard+Utils.h
+++ b/third_party/mozilla/NSPasteboard+Utils.h
diff --git a/third_party/mozilla/include/NSPasteboard+Utils.mm b/third_party/mozilla/NSPasteboard+Utils.mm
index 2a7ee5e..2a7ee5e 100644
--- a/third_party/mozilla/include/NSPasteboard+Utils.mm
+++ b/third_party/mozilla/NSPasteboard+Utils.mm
diff --git a/third_party/mozilla/include/NSScreen+Utils.h b/third_party/mozilla/NSScreen+Utils.h
index d8dc23c..d8dc23c 100644
--- a/third_party/mozilla/include/NSScreen+Utils.h
+++ b/third_party/mozilla/NSScreen+Utils.h
diff --git a/third_party/mozilla/include/NSScreen+Utils.m b/third_party/mozilla/NSScreen+Utils.m
index 8d3318d..8d3318d 100644
--- a/third_party/mozilla/include/NSScreen+Utils.m
+++ b/third_party/mozilla/NSScreen+Utils.m
diff --git a/third_party/mozilla/include/NSString+Utils.h b/third_party/mozilla/NSString+Utils.h
index f556cc6..f556cc6 100644
--- a/third_party/mozilla/include/NSString+Utils.h
+++ b/third_party/mozilla/NSString+Utils.h
diff --git a/third_party/mozilla/include/NSString+Utils.m b/third_party/mozilla/NSString+Utils.m
index c145505..c145505 100644
--- a/third_party/mozilla/include/NSString+Utils.m
+++ b/third_party/mozilla/NSString+Utils.m
diff --git a/third_party/mozilla/include/NSURL+Utils.h b/third_party/mozilla/NSURL+Utils.h
index dc7501e..dc7501e 100644
--- a/third_party/mozilla/include/NSURL+Utils.h
+++ b/third_party/mozilla/NSURL+Utils.h
diff --git a/third_party/mozilla/include/NSURL+Utils.m b/third_party/mozilla/NSURL+Utils.m
index 300facd..300facd 100644
--- a/third_party/mozilla/include/NSURL+Utils.m
+++ b/third_party/mozilla/NSURL+Utils.m
diff --git a/third_party/mozilla/include/NSWorkspace+Utils.h b/third_party/mozilla/NSWorkspace+Utils.h
index 2ef1d10..2ef1d10 100644
--- a/third_party/mozilla/include/NSWorkspace+Utils.h
+++ b/third_party/mozilla/NSWorkspace+Utils.h
diff --git a/third_party/mozilla/include/NSWorkspace+Utils.m b/third_party/mozilla/NSWorkspace+Utils.m
index e3d052c..e3d052c 100644
--- a/third_party/mozilla/include/NSWorkspace+Utils.m
+++ b/third_party/mozilla/NSWorkspace+Utils.m
diff --git a/third_party/mozilla/include/README.chromium b/third_party/mozilla/README.chromium
index 12c22a3..12c22a3 100644
--- a/third_party/mozilla/include/README.chromium
+++ b/third_party/mozilla/README.chromium
diff --git a/webkit/glue/plugins/DEPS b/webkit/glue/plugins/DEPS
deleted file mode 100644
index 6085fe5..0000000
--- a/webkit/glue/plugins/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
- "+third_party/mozilla/include",
-]
generated by cgit v1.1 at 2025-01-19 18:04:40 +0000