summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 17:02:00 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 17:02:00 +0000
commit20e87f9a772420ebbd140312c0c08d40954ad552 (patch)
tree91cf3881c80aec0f1933ca70d6379ce5265753b8 /chrome/browser/views
parentfbfc2ecd20639aa3c97a5579b5f854ed6792cb49 (diff)
downloadchromium_src-20e87f9a772420ebbd140312c0c08d40954ad552.zip
chromium_src-20e87f9a772420ebbd140312c0c08d40954ad552.tar.gz
chromium_src-20e87f9a772420ebbd140312c0c08d40954ad552.tar.bz2
Removing the code that are no longer in use.
* CompactNavigationBar this feature has been discontinued * BrowserStatusAreaView status area used to have a menu, but it's gone and this class no longer needed. * BrowserExtender used to implement chromeos specific feature, which has been replaced by chromeos/browser_view BUG=49229 TEST=no functional chagne. all test should pass. Review URL: http://codereview.chromium.org/3035004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/frame/browser_extender.h47
-rw-r--r--chrome/browser/views/frame/browser_frame_gtk.cc1
-rw-r--r--chrome/browser/views/frame/browser_view.cc14
-rw-r--r--chrome/browser/views/frame/browser_view.h8
-rw-r--r--chrome/browser/views/frame/browser_view_layout.cc1
-rw-r--r--chrome/browser/views/frame/opaque_browser_frame_view.cc1
6 files changed, 0 insertions, 72 deletions
diff --git a/chrome/browser/views/frame/browser_extender.h b/chrome/browser/views/frame/browser_extender.h
deleted file mode 100644
index 5d096e4..0000000
--- a/chrome/browser/views/frame/browser_extender.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_EXTENDER_H_
-#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_EXTENDER_H_
-
-#include "base/basictypes.h"
-#include "gfx/rect.h"
-
-class BrowserView;
-
-// Note: This class is deprecated (but still in use)
-// and will be removed in the near future.
-//
-// BrowserExtender adds chromeos specific features to BrowserView.
-// The factory method |Create(BrowserView*)| creates different types
-// of extender depending on the type of BrowserView and target platform.
-// Please see browser/chromeos/browser_extenders.cc for ChromeOS extenders, and
-// standard_extender.cc for Chrome browser.
-class BrowserExtender {
- public:
- BrowserExtender()
- : can_close_(true) {
- }
-
- virtual ~BrowserExtender() {}
-
- // Tells if the browser can be closed.
- bool can_close() const {
- return can_close_;
- }
-
- // Specifies if the browser can be closed or not. This typically set
- // to false when the browser is being dragged.
- void set_can_close(bool b) {
- can_close_ = b;
- }
-
- private:
- // True if the browser can be closed. See set_can_close method for setails.
- bool can_close_;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserExtender);
-};
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_EXTENDER_H_
diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc
index 74a6cf9..a1302ee 100644
--- a/chrome/browser/views/frame/browser_frame_gtk.cc
+++ b/chrome/browser/views/frame/browser_frame_gtk.cc
@@ -9,7 +9,6 @@
#include "chrome/browser/profile.h"
#include "chrome/browser/status_bubble.h"
#include "chrome/browser/views/frame/app_panel_browser_frame_view.h"
-#include "chrome/browser/views/frame/browser_extender.h"
#include "chrome/browser/views/frame/browser_root_view.h"
#include "chrome/browser/views/frame/browser_view.h"
#include "chrome/browser/views/frame/opaque_browser_frame_view.h"
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 304f6fc..a34ab3a 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -33,7 +33,6 @@
#include "chrome/browser/views/browser_dialogs.h"
#include "chrome/browser/views/download_shelf_view.h"
#include "chrome/browser/views/extensions/extension_shelf.h"
-#include "chrome/browser/views/frame/browser_extender.h"
#include "chrome/browser/views/frame/browser_view_layout.h"
#include "chrome/browser/views/fullscreen_exit_bubble.h"
#include "chrome/browser/views/status_bubble_views.h"
@@ -449,9 +448,6 @@ BrowserView::~BrowserView() {
// notifications will call back into deleted objects).
download_shelf_.reset();
- // Destory extender before destroying browser.
- browser_extender_.reset();
-
// The TabStrip attaches a listener to the model. Make sure we shut down the
// TabStrip first so that it can cleanly remove the listener.
tabstrip_->GetParent()->RemoveChildView(tabstrip_);
@@ -1256,11 +1252,6 @@ void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
GetFocusManager());
}
-#if defined(OS_CHROMEOS)
-void BrowserView::ToggleCompactNavigationBar() {
-}
-#endif
-
// TODO(devint): http://b/issue?id=1117225 Cut, Copy, and Paste are always
// enabled in the page menu regardless of whether the command will do
// anything. When someone selects the menu item, we just act as if they hit
@@ -1591,9 +1582,6 @@ views::ClientView* BrowserView::CreateClientView(views::Window* window) {
// BrowserView, views::ClientView overrides:
bool BrowserView::CanClose() const {
- if (!browser_extender_->can_close())
- return false;
-
// You cannot close a frame for which there is an active originating drag
// session.
if (tabstrip_->IsDragSessionActive())
@@ -1862,8 +1850,6 @@ void BrowserView::Init() {
}
#endif
- browser_extender_.reset(new BrowserExtender());
-
// We're now initialized and ready to process Layout requests.
ignore_layout_ = false;
}
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index 1300bc4..52794ab 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -44,7 +44,6 @@ class AccessibleViewHelper;
class BookmarkBarView;
class Browser;
class BrowserBubble;
-class BrowserExtender;
class BrowserViewLayout;
class DownloadShelfView;
class EncodingMenuModel;
@@ -250,8 +249,6 @@ class BrowserView : public BrowserBubbleHost,
// Called when the activation of the frame changes.
virtual void ActivationChanged(bool activated);
- BrowserExtender* browser_extender() const { return browser_extender_.get(); }
-
// Overriden from ImageLoadingTracker::Observer.
virtual void OnImageLoaded(SkBitmap* image, ExtensionResource resource,
int index);
@@ -331,9 +328,6 @@ class BrowserView : public BrowserBubbleHost,
bool* is_keyboard_shortcut);
virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
virtual void ShowCreateShortcutsDialog(TabContents* tab_contents);
-#if defined(OS_CHROMEOS)
- virtual void ToggleCompactNavigationBar();
-#endif // defined(OS_CHROMEOS)
virtual void Cut();
virtual void Copy();
virtual void Paste();
@@ -603,8 +597,6 @@ class BrowserView : public BrowserBubbleHost,
// A bottom bar for showing extensions.
ExtensionShelf* extension_shelf_;
- scoped_ptr<BrowserExtender> browser_extender_;
-
UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
scoped_ptr<AccessibleViewHelper> accessible_view_helper_;
diff --git a/chrome/browser/views/frame/browser_view_layout.cc b/chrome/browser/views/frame/browser_view_layout.cc
index e26b669c..a332beb 100644
--- a/chrome/browser/views/frame/browser_view_layout.cc
+++ b/chrome/browser/views/frame/browser_view_layout.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/views/bookmark_bar_view.h"
#include "chrome/browser/views/download_shelf_view.h"
#include "chrome/browser/views/extensions/extension_shelf.h"
-#include "chrome/browser/views/frame/browser_extender.h"
#include "chrome/browser/views/frame/browser_frame.h"
#include "chrome/browser/views/frame/browser_view.h"
#include "chrome/browser/views/tabs/side_tab_strip.h"
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index d60eafa..fc6f4de 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -10,7 +10,6 @@
#include "base/compiler_specific.h"
#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/views/frame/browser_extender.h"
#include "chrome/browser/views/frame/browser_frame.h"
#include "chrome/browser/views/frame/browser_view.h"
#include "chrome/browser/views/tabs/tab_strip.h"