summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-30 01:11:15 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-30 01:11:15 +0000
commit767ddd9645574c513c63cad74145c2c1666946ae (patch)
tree0663218544c4e08225bce88ef9f65dcbf178cb69 /chrome/browser/views/frame
parentc01ec9515d1892e2a62d3e4423a2bb37ac79e551 (diff)
downloadchromium_src-767ddd9645574c513c63cad74145c2c1666946ae.zip
chromium_src-767ddd9645574c513c63cad74145c2c1666946ae.tar.gz
chromium_src-767ddd9645574c513c63cad74145c2c1666946ae.tar.bz2
Reverting 17271.
Review URL: http://codereview.chromium.org/118040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
-rw-r--r--chrome/browser/views/frame/browser_view.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index faf0f0b..b30d106 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -621,11 +621,7 @@ BrowserWindowTesting* BrowserView::GetBrowserWindowTesting() {
}
StatusBubble* BrowserView::GetStatusBubble() {
-#if !defined(TOOLKIT_VIEWS)
return status_bubble_.get();
-#else
- return NULL;
-#endif
}
void BrowserView::SelectedTabToolbarSizeChanged(bool is_animating) {
@@ -1337,7 +1333,6 @@ void BrowserView::Init() {
}
void BrowserView::InitSystemMenu() {
-#if defined(OS_WIN)
system_menu_.reset(
views::Menu::GetSystemMenu(frame_->GetWindow()->GetNativeWindow()));
int insertion_index = std::max(0, system_menu_->ItemCount() - 1);
@@ -1357,7 +1352,6 @@ void BrowserView::InitSystemMenu() {
} else {
BuildMenuForTabStriplessWindow(system_menu_.get(), insertion_index);
}
-#endif
}
int BrowserView::LayoutTabStrip() {