summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 21:57:45 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 21:57:45 +0000
commitc848d3d965724a00356d0bb92ae98505f2853a6c (patch)
tree5d0c5340cb7e51b5fc3b04d59cb1da5ac31a78f2 /chrome/browser/cocoa
parent2f9791735a0c7066a261702d85eea393ac1c84cb (diff)
downloadchromium_src-c848d3d965724a00356d0bb92ae98505f2853a6c.zip
chromium_src-c848d3d965724a00356d0bb92ae98505f2853a6c.tar.gz
chromium_src-c848d3d965724a00356d0bb92ae98505f2853a6c.tar.bz2
Moves TabStripModelObserver/Delegate into their own headers.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3425009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/applescript/window_applescript.mm1
-rw-r--r--chrome/browser/cocoa/bookmark_all_tabs_controller.mm1
-rw-r--r--chrome/browser/cocoa/tab_strip_controller_unittest.mm2
-rw-r--r--chrome/browser/cocoa/tab_strip_model_observer_bridge.h3
-rw-r--r--chrome/browser/cocoa/tab_strip_model_observer_bridge.mm2
-rw-r--r--chrome/browser/cocoa/tabpose_window_unittest.mm1
6 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/applescript/window_applescript.mm b/chrome/browser/cocoa/applescript/window_applescript.mm
index 4b04896..624f9be 100644
--- a/chrome/browser/cocoa/applescript/window_applescript.mm
+++ b/chrome/browser/cocoa/applescript/window_applescript.mm
@@ -18,6 +18,7 @@
#import "chrome/browser/cocoa/applescript/tab_applescript.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/common/url_constants.h"
@interface WindowAppleScript(WindowAppleScriptPrivateMethods)
diff --git a/chrome/browser/cocoa/bookmark_all_tabs_controller.mm b/chrome/browser/cocoa/bookmark_all_tabs_controller.mm
index 13dd036..b47f92a 100644
--- a/chrome/browser/cocoa/bookmark_all_tabs_controller.mm
+++ b/chrome/browser/cocoa/bookmark_all_tabs_controller.mm
@@ -10,6 +10,7 @@
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tabs/tab_strip_model.h"
#include "grit/generated_resources.h"
@implementation BookmarkAllTabsController
diff --git a/chrome/browser/cocoa/tab_strip_controller_unittest.mm b/chrome/browser/cocoa/tab_strip_controller_unittest.mm
index cddc952..b4f6c61 100644
--- a/chrome/browser/cocoa/tab_strip_controller_unittest.mm
+++ b/chrome/browser/cocoa/tab_strip_controller_unittest.mm
@@ -78,6 +78,8 @@ class TestTabStripDelegate : public TabStripModelDelegate {
virtual bool CanBookmarkAllTabs() const { return false; }
+ virtual bool CanCloseTab() const { return true; }
+
virtual void BookmarkAllTabs() {}
virtual bool UseVerticalTabs() const { return false; }
diff --git a/chrome/browser/cocoa/tab_strip_model_observer_bridge.h b/chrome/browser/cocoa/tab_strip_model_observer_bridge.h
index 7a3497c..140ccc1 100644
--- a/chrome/browser/cocoa/tab_strip_model_observer_bridge.h
+++ b/chrome/browser/cocoa/tab_strip_model_observer_bridge.h
@@ -8,9 +8,10 @@
#import <Foundation/Foundation.h>
-#include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/tabs/tab_strip_model_observer.h"
class TabContents;
+class TabStripModel;
// A C++ bridge class to handle receiving notifications from the C++ tab strip
// model. When the caller allocates a bridge, it automatically registers for
diff --git a/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm b/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm
index dafe81b..a6a06f9 100644
--- a/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm
+++ b/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm
@@ -4,6 +4,8 @@
#include "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
+#include "chrome/browser/tabs/tab_strip_model.h"
+
TabStripModelObserverBridge::TabStripModelObserverBridge(TabStripModel* model,
id controller)
: controller_(controller), model_(model) {
diff --git a/chrome/browser/cocoa/tabpose_window_unittest.mm b/chrome/browser/cocoa/tabpose_window_unittest.mm
index 10e2707..82bc472 100644
--- a/chrome/browser/cocoa/tabpose_window_unittest.mm
+++ b/chrome/browser/cocoa/tabpose_window_unittest.mm
@@ -9,6 +9,7 @@
#import "chrome/browser/cocoa/cocoa_test_helper.h"
#include "chrome/browser/renderer_host/site_instance.h"
#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tabs/tab_strip_model.h"
#include "testing/gtest/include/gtest/gtest.h"
class TabposeWindowTest : public CocoaTest {