summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/about_window_controller.mm1
-rw-r--r--chrome/browser/cocoa/browser_window_controller.mm1
-rw-r--r--chrome/browser/cocoa/collected_cookies_mac.h1
-rw-r--r--chrome/browser/cocoa/content_exceptions_window_controller.mm1
-rw-r--r--chrome/browser/cocoa/cookies_window_controller.h3
-rw-r--r--chrome/browser/cocoa/download_item_controller.mm1
-rw-r--r--chrome/browser/cocoa/import_progress_dialog.mm1
-rw-r--r--chrome/browser/cocoa/install_from_dmg.mm1
-rw-r--r--chrome/browser/cocoa/keystone_glue.mm1
-rw-r--r--chrome/browser/cocoa/restart_browser.mm1
-rw-r--r--chrome/browser/cocoa/toolbar_controller.mm1
-rw-r--r--chrome/browser/cocoa/ui_localizer.mm1
-rw-r--r--chrome/browser/cocoa/web_contents_drag_source.h2
-rw-r--r--chrome/browser/cocoa/web_drag_source.h1
14 files changed, 12 insertions, 5 deletions
diff --git a/chrome/browser/cocoa/about_window_controller.mm b/chrome/browser/cocoa/about_window_controller.mm
index 1dcb37a..f366b61 100644
--- a/chrome/browser/cocoa/about_window_controller.mm
+++ b/chrome/browser/cocoa/about_window_controller.mm
@@ -4,6 +4,7 @@
#import "chrome/browser/cocoa/about_window_controller.h"
+#include "app/l10n_util.h"
#include "app/l10n_util_mac.h"
#include "app/resource_bundle.h"
#include "base/logging.h"
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index d31659b0..b6eb3b1 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -6,6 +6,7 @@
#include <Carbon/Carbon.h>
+#include "app/l10n_util.h"
#include "app/l10n_util_mac.h"
#include "base/mac_util.h"
#include "base/nsimage_cache_mac.h"
diff --git a/chrome/browser/cocoa/collected_cookies_mac.h b/chrome/browser/cocoa/collected_cookies_mac.h
index 9f5b5dd..7bd7a90 100644
--- a/chrome/browser/cocoa/collected_cookies_mac.h
+++ b/chrome/browser/cocoa/collected_cookies_mac.h
@@ -4,7 +4,6 @@
#import <Cocoa/Cocoa.h>
-#include "app/tree_model.h"
#include "base/cocoa_protocols_mac.h"
#include "base/scoped_nsobject.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.mm b/chrome/browser/cocoa/content_exceptions_window_controller.mm
index 582997c..6d0c177a 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.mm
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.mm
@@ -4,6 +4,7 @@
#import "chrome/browser/cocoa/content_exceptions_window_controller.h"
+#include "app/l10n_util.h"
#include "app/l10n_util_mac.h"
#include "app/table_model_observer.h"
#include "base/command_line.h"
diff --git a/chrome/browser/cocoa/cookies_window_controller.h b/chrome/browser/cocoa/cookies_window_controller.h
index 2ebe4d0..ea3e0fd 100644
--- a/chrome/browser/cocoa/cookies_window_controller.h
+++ b/chrome/browser/cocoa/cookies_window_controller.h
@@ -4,7 +4,6 @@
#import <Cocoa/Cocoa.h>
-#include "app/tree_model.h"
#include "base/cocoa_protocols_mac.h"
#include "base/scoped_nsobject.h"
#include "base/scoped_ptr.h"
@@ -15,6 +14,8 @@
@class CookiesWindowController;
@class CookieDetailsViewController;
class Profile;
+class TreeModel;
+class TreeModelNode;
namespace {
class CookiesWindowControllerTest;
diff --git a/chrome/browser/cocoa/download_item_controller.mm b/chrome/browser/cocoa/download_item_controller.mm
index 1c77eee..86cab8d 100644
--- a/chrome/browser/cocoa/download_item_controller.mm
+++ b/chrome/browser/cocoa/download_item_controller.mm
@@ -9,6 +9,7 @@
#include "app/text_elider.h"
#include "base/histogram.h"
#include "base/mac_util.h"
+#include "base/string_util.h"
#include "base/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
#import "chrome/browser/browser_theme_provider.h"
diff --git a/chrome/browser/cocoa/import_progress_dialog.mm b/chrome/browser/cocoa/import_progress_dialog.mm
index 83da1d3..109365b 100644
--- a/chrome/browser/cocoa/import_progress_dialog.mm
+++ b/chrome/browser/cocoa/import_progress_dialog.mm
@@ -4,6 +4,7 @@
#import "chrome/browser/cocoa/import_progress_dialog.h"
+#include "app/l10n_util.h"
#include "app/l10n_util_mac.h"
#include "base/logging.h"
#include "base/mac_util.h"
diff --git a/chrome/browser/cocoa/install_from_dmg.mm b/chrome/browser/cocoa/install_from_dmg.mm
index 27ffa38..cffe3fc 100644
--- a/chrome/browser/cocoa/install_from_dmg.mm
+++ b/chrome/browser/cocoa/install_from_dmg.mm
@@ -13,6 +13,7 @@
#include <sys/param.h>
#include <sys/mount.h>
+#include "app/l10n_util.h"
#import "app/l10n_util_mac.h"
#include "base/basictypes.h"
#include "base/command_line.h"
diff --git a/chrome/browser/cocoa/keystone_glue.mm b/chrome/browser/cocoa/keystone_glue.mm
index a097fd7..a0162a3 100644
--- a/chrome/browser/cocoa/keystone_glue.mm
+++ b/chrome/browser/cocoa/keystone_glue.mm
@@ -9,6 +9,7 @@
#include <vector>
+#include "app/l10n_util.h"
#import "app/l10n_util_mac.h"
#include "base/logging.h"
#include "base/mac_util.h"
diff --git a/chrome/browser/cocoa/restart_browser.mm b/chrome/browser/cocoa/restart_browser.mm
index d3747d60..3d0cbb1 100644
--- a/chrome/browser/cocoa/restart_browser.mm
+++ b/chrome/browser/cocoa/restart_browser.mm
@@ -4,6 +4,7 @@
#import "chrome/browser/cocoa/restart_browser.h"
+#include "app/l10n_util.h"
#include "app/l10n_util_mac.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index 7f0e3ed..7a54619 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -6,6 +6,7 @@
#include <algorithm>
+#include "app/l10n_util.h"
#include "app/l10n_util_mac.h"
#include "app/menus/accelerator_cocoa.h"
#include "app/menus/menu_model.h"
diff --git a/chrome/browser/cocoa/ui_localizer.mm b/chrome/browser/cocoa/ui_localizer.mm
index 77e9154..d085353 100644
--- a/chrome/browser/cocoa/ui_localizer.mm
+++ b/chrome/browser/cocoa/ui_localizer.mm
@@ -7,6 +7,7 @@
#import <Foundation/Foundation.h>
#include <stdlib.h>
+#include "app/l10n_util.h"
#include "app/l10n_util_mac.h"
#include "base/sys_string_conversions.h"
#include "base/logging.h"
diff --git a/chrome/browser/cocoa/web_contents_drag_source.h b/chrome/browser/cocoa/web_contents_drag_source.h
index a0d31b2..55e93b9 100644
--- a/chrome/browser/cocoa/web_contents_drag_source.h
+++ b/chrome/browser/cocoa/web_contents_drag_source.h
@@ -8,7 +8,6 @@
#import <Cocoa/Cocoa.h>
-#include "app/download_file_interface.h"
#include "base/file_path.h"
#include "base/scoped_nsobject.h"
#include "base/scoped_ptr.h"
@@ -63,4 +62,3 @@
@end
#endif // define CHROME_BROWSER_COCOA_WEB_CONTENTS_DRAG_SOURCE_H_
-
diff --git a/chrome/browser/cocoa/web_drag_source.h b/chrome/browser/cocoa/web_drag_source.h
index a853c6b..9cfcba5 100644
--- a/chrome/browser/cocoa/web_drag_source.h
+++ b/chrome/browser/cocoa/web_drag_source.h
@@ -4,7 +4,6 @@
#import <Cocoa/Cocoa.h>
-#include "app/download_file_interface.h"
#include "base/file_path.h"
#include "base/scoped_nsobject.h"
#include "base/scoped_ptr.h"