| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/views/frame/browser_view.h" | 5 #include "chrome/browser/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 browser_->tabstrip_model()->RemoveObserver(this); | 298 browser_->tabstrip_model()->RemoveObserver(this); |
| 299 | 299 |
| 300 #if defined(OS_WIN) | 300 #if defined(OS_WIN) |
| 301 // Stop hung plugin monitoring. | 301 // Stop hung plugin monitoring. |
| 302 ticker_.Stop(); | 302 ticker_.Stop(); |
| 303 ticker_.UnregisterTickHandler(&hung_window_detector_); | 303 ticker_.UnregisterTickHandler(&hung_window_detector_); |
| 304 #endif | 304 #endif |
| 305 } | 305 } |
| 306 | 306 |
| 307 // static | 307 // static |
| 308 BrowserView* BrowserView::GetBrowserViewForNativeView(gfx::NativeView window) { | 308 BrowserView* BrowserView::GetBrowserViewForNativeWindow( |
| 309 gfx::NativeWindow window) { |
| 309 #if defined(OS_WIN) | 310 #if defined(OS_WIN) |
| 310 if (IsWindow(window)) { | 311 if (IsWindow(window)) { |
| 311 HANDLE data = GetProp(window, kBrowserViewKey); | 312 HANDLE data = GetProp(window, kBrowserViewKey); |
| 312 if (data) | 313 if (data) |
| 313 return reinterpret_cast<BrowserView*>(data); | 314 return reinterpret_cast<BrowserView*>(data); |
| 314 } | 315 } |
| 315 #else | 316 #else |
| 316 if (window) { | 317 if (window) { |
| 317 return static_cast<BrowserView*>( | 318 return static_cast<BrowserView*>( |
| 318 g_object_get_data(G_OBJECT(window), kBrowserViewKey)); | 319 g_object_get_data(G_OBJECT(window), kBrowserViewKey)); |
| (...skipping 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1718 | 1719 |
| 1719 // static | 1720 // static |
| 1720 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 1721 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 1721 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 1722 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 1722 } | 1723 } |
| 1723 | 1724 |
| 1724 // static | 1725 // static |
| 1725 void BrowserList::AllBrowsersClosed() { | 1726 void BrowserList::AllBrowsersClosed() { |
| 1726 views::Window::CloseAllSecondaryWindows(); | 1727 views::Window::CloseAllSecondaryWindows(); |
| 1727 } | 1728 } |
| OLD | NEW |