diff options
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/applescript/window_applescript.mm | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/tab_strip_controller.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/tab_strip_controller_unittest.mm | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/applescript/window_applescript.mm b/chrome/browser/cocoa/applescript/window_applescript.mm index cb2eb81..4b04896 100644 --- a/chrome/browser/cocoa/applescript/window_applescript.mm +++ b/chrome/browser/cocoa/applescript/window_applescript.mm @@ -175,7 +175,8 @@ -1, // To indicate tab is inserted at end. TabStripModel::ADD_SELECTED, NULL, - std::string()); + std::string(), + NULL); tabContents->set_new_tab_start_time(newTabStartTime); [aTab setTabContent:tabContents]; @@ -196,7 +197,8 @@ index, TabStripModel::ADD_SELECTED, NULL, - std::string()); + std::string(), + NULL); tabContents->set_new_tab_start_time(newTabStartTime); [aTab setTabContent:tabContents]; diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm index 1a907bd..cae8307 100644 --- a/chrome/browser/cocoa/tab_strip_controller.mm +++ b/chrome/browser/cocoa/tab_strip_controller.mm @@ -1653,7 +1653,7 @@ private: browser_->AddTabWithURL(url, GURL(), PageTransition::TYPED, index, TabStripModel::ADD_SELECTED | TabStripModel::ADD_FORCE_INDEX, - NULL, std::string()); + NULL, std::string(), NULL); break; case CURRENT_TAB: UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLOnTab"), diff --git a/chrome/browser/cocoa/tab_strip_controller_unittest.mm b/chrome/browser/cocoa/tab_strip_controller_unittest.mm index aadea16..032912d 100644 --- a/chrome/browser/cocoa/tab_strip_controller_unittest.mm +++ b/chrome/browser/cocoa/tab_strip_controller_unittest.mm @@ -68,6 +68,8 @@ class TestTabStripDelegate : public TabStripModelDelegate { virtual bool UseVerticalTabs() const { return false; } virtual void ToggleUseVerticalTabs() {} + + virtual bool LargeIconsPermitted() const { return true; } }; class TabStripControllerTest : public CocoaTest { |