Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3940)

Unified Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 6121007: Revert 71230 to see if it is related to hang on linux interactive_ui_tests.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_view.h
===================================================================
--- chrome/browser/ui/views/frame/browser_view.h (revision 71251)
+++ chrome/browser/ui/views/frame/browser_view.h (working copy)
@@ -26,7 +26,6 @@
#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
#include "chrome/common/notification_registrar.h"
#include "gfx/native_widget_types.h"
-#include "views/controls/single_split_view.h"
#include "views/window/client_view.h"
#include "views/window/window_delegate.h"
@@ -54,7 +53,6 @@
class LocationBarView;
class SideTabStrip;
class StatusBubbleViews;
-class TabContentsContainer;
class TabStripModel;
class ToolbarView;
class ZoomMenuModel;
@@ -68,6 +66,7 @@
namespace views {
class ExternalFocusTracker;
class Menu;
+class SingleSplitView;
}
///////////////////////////////////////////////////////////////////////////////
@@ -85,7 +84,7 @@
public views::WindowDelegate,
public views::ClientView,
public InfoBarContainer::Delegate,
- public views::SingleSplitView::Observer {
+ public TabContentsContainer::ReservedAreaDelegate {
public:
// The browser view's class name.
static const char kViewClassName[];
@@ -397,8 +396,8 @@
// InfoBarContainer::Delegate overrides
virtual void InfoBarSizeChanged(bool is_animating);
- // views::SingleSplitView::Observer overrides:
- virtual bool SplitHandleMoved(views::SingleSplitView* view);
+ // TabContentsContainer::ReservedAreaDelegate overrides.
+ virtual void UpdateReservedContentsRect(const TabContentsContainer* source);
protected:
// Appends to |toolbars| a pointer to each AccessiblePaneView that
@@ -523,9 +522,6 @@
void ProcessTabSelected(TabContentsWrapper* new_contents,
bool change_tab_contents);
- // Exposes resize corner size to BrowserViewLayout.
- gfx::Size GetResizeCornerSize() const;
-
// Last focused view that issued a tab traversal.
int last_focused_view_storage_id_;
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698