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

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

Issue 10368027: Remove Aero Peek Tabs code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 8 years, 7 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 | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/chrome_browser.gypi » ('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.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 8bbbf16b3c4b6a3b3c3ce72d7ba877ddac8faaf8..e2ab96b9d1d7c258d8dc95e31769c1475ff08c54 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -110,7 +110,6 @@
#include "chrome/browser/ui/views/ash/window_positioner.h"
#elif defined(OS_WIN) && !defined(USE_AURA)
#include "base/win/metro.h"
-#include "chrome/browser/aeropeek_manager.h"
#include "chrome/browser/jumplist_win.h"
#include "ui/views/widget/native_widget_win.h"
#endif
@@ -362,10 +361,6 @@ BrowserView::~BrowserView() {
browser_->tabstrip_model()->RemoveObserver(this);
#if defined(OS_WIN) && !defined(USE_AURA)
- // Remove this observer.
- if (aeropeek_manager_.get())
- browser_->tabstrip_model()->RemoveObserver(aeropeek_manager_.get());
-
// Stop hung plugin monitoring.
ticker_.Stop();
ticker_.UnregisterTickHandler(&hung_window_detector_);
@@ -1735,20 +1730,6 @@ void BrowserView::Layout() {
// The status bubble position requires that all other layout finish first.
LayoutStatusBubble();
-
-#if defined(OS_WIN) && !defined(USE_AURA)
- // Send the margins of the "user-perceived content area" of this
- // browser window so AeroPeekManager can render a background-tab image in
- // the area.
- // TODO(pkasting) correct content inset??
- if (aeropeek_manager_.get()) {
- gfx::Insets insets(GetFindBarBoundingBox().y() + 1,
- 0,
- 0,
- 0);
- aeropeek_manager_->SetContentInsets(insets);
- }
-#endif
}
void BrowserView::PaintChildren(gfx::Canvas* canvas) {
@@ -1896,12 +1877,6 @@ void BrowserView::Init() {
jumplist_ = new JumpList();
jumplist_->AddObserver(browser_->profile());
}
-
- if (AeroPeekManager::Enabled()) {
- aeropeek_manager_.reset(new AeroPeekManager(
- frame_->GetNativeWindow()));
- browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get());
- }
#endif
// We're now initialized and ready to process Layout requests.
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698