summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/html_dialog_window_controller.mm4
-rw-r--r--chrome/browser/cocoa/tab_strip_controller_unittest.mm2
-rw-r--r--chrome/browser/cocoa/tabpose_window_unittest.mm3
-rw-r--r--chrome/browser/cocoa/translate/translate_infobar_unittest.mm1
4 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/html_dialog_window_controller.mm b/chrome/browser/cocoa/html_dialog_window_controller.mm
index 87691fb..b959798 100644
--- a/chrome/browser/cocoa/html_dialog_window_controller.mm
+++ b/chrome/browser/cocoa/html_dialog_window_controller.mm
@@ -265,8 +265,8 @@ void HtmlDialogWindowDelegateBridge::HandleKeyboardEvent(
}
- (void)loadDialogContents {
- tabContents_.reset(
- new TabContents(delegate_->profile(), NULL, MSG_ROUTING_NONE, NULL));
+ tabContents_.reset(new TabContents(
+ delegate_->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL));
[[self window] setContentView:tabContents_->GetNativeView()];
tabContents_->set_delegate(delegate_.get());
diff --git a/chrome/browser/cocoa/tab_strip_controller_unittest.mm b/chrome/browser/cocoa/tab_strip_controller_unittest.mm
index e879b3c..cddc952 100644
--- a/chrome/browser/cocoa/tab_strip_controller_unittest.mm
+++ b/chrome/browser/cocoa/tab_strip_controller_unittest.mm
@@ -150,7 +150,7 @@ TEST_F(TabStripControllerTest, AddRemoveTabs) {
SiteInstance::CreateSiteInstance(browser_helper_.profile());
TabContents* tab_contents =
new TabContents(browser_helper_.profile(), instance, MSG_ROUTING_NONE,
- NULL);
+ NULL, NULL);
model_->AppendTabContents(tab_contents, true);
EXPECT_EQ(model_->count(), 1);
}
diff --git a/chrome/browser/cocoa/tabpose_window_unittest.mm b/chrome/browser/cocoa/tabpose_window_unittest.mm
index e9ed441..10e2707 100644
--- a/chrome/browser/cocoa/tabpose_window_unittest.mm
+++ b/chrome/browser/cocoa/tabpose_window_unittest.mm
@@ -20,7 +20,8 @@ class TabposeWindowTest : public CocoaTest {
void AppendTabToStrip() {
TabContents* tab_contents = new TabContents(
- browser_helper_.profile(), site_instance_, MSG_ROUTING_NONE, NULL);
+ browser_helper_.profile(), site_instance_, MSG_ROUTING_NONE,
+ NULL, NULL);
browser_helper_.browser()->tabstrip_model()->AppendTabContents(
tab_contents, /*foreground=*/true);
}
diff --git a/chrome/browser/cocoa/translate/translate_infobar_unittest.mm b/chrome/browser/cocoa/translate/translate_infobar_unittest.mm
index 2c8f767..a389eba 100644
--- a/chrome/browser/cocoa/translate/translate_infobar_unittest.mm
+++ b/chrome/browser/cocoa/translate/translate_infobar_unittest.mm
@@ -81,6 +81,7 @@ class TranslationInfoBarTest : public CocoaTest {
new TabContents(browser_helper_.profile(),
NULL,
MSG_ROUTING_NONE,
+ NULL,
NULL));
CreateInfoBar();
}