summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-05 21:04:46 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-05 21:04:46 +0000
commit7d886d12386ee44f2afd10ec47304135d0c4192b (patch)
treed06e04d969e3c148058c257522f7360ae26d056b /chrome/browser
parent1ed7e00c6e9d9b757117ca51c652a5460b5b8d66 (diff)
downloadchromium_src-7d886d12386ee44f2afd10ec47304135d0c4192b.zip
chromium_src-7d886d12386ee44f2afd10ec47304135d0c4192b.tar.gz
chromium_src-7d886d12386ee44f2afd10ec47304135d0c4192b.tar.bz2
Hook up tab close menu item and plumb tab closing scaffolding through UI layer on Mac. Fix several unregistered prefs issues from other checkins.
Review URL: http://codereview.chromium.org/21092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_prefs.cc2
-rw-r--r--chrome/browser/cocoa/tab_strip_controller.mm5
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 4d0ee04..445130c 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -39,6 +39,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
Browser::RegisterPrefs(local_state);
BrowserRenderProcessHost::RegisterPrefs(local_state);
CacheManagerHost::RegisterPrefs(local_state);
+ SafeBrowsingService::RegisterPrefs(local_state);
#if defined(OS_WIN) // TODO(port): whittle this down as we port
BookmarkManagerView::RegisterPrefs(local_state);
BrowserView::RegisterBrowserViewPrefs(local_state);
@@ -49,7 +50,6 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
PageInfoWindow::RegisterPrefs(local_state);
TaskManager::RegisterPrefs(local_state);
ExternalProtocolHandler::RegisterPrefs(local_state);
- SafeBrowsingService::RegisterPrefs(local_state);
#endif
// User prefs
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index cc491ff..e7d88c4 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -257,9 +257,11 @@ void TabStripBridge::TabInsertedAt(TabContents* contents,
}
void TabStripBridge::TabClosingAt(TabContents* contents, int index) {
+ NOTIMPLEMENTED();
}
void TabStripBridge::TabDetachedAt(TabContents* contents, int index) {
+ NOTIMPLEMENTED();
}
void TabStripBridge::TabSelectedAt(TabContents* old_contents,
@@ -275,10 +277,13 @@ void TabStripBridge::TabSelectedAt(TabContents* old_contents,
void TabStripBridge::TabMoved(TabContents* contents,
int from_index,
int to_index) {
+ NOTIMPLEMENTED();
}
void TabStripBridge::TabChangedAt(TabContents* contents, int index) {
+ NOTIMPLEMENTED();
}
void TabStripBridge::TabStripEmpty() {
+ NOTIMPLEMENTED();
}