| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 #include "app/view_prop.h" | 85 #include "app/view_prop.h" |
| 86 #include "app/win_util.h" | 86 #include "app/win_util.h" |
| 87 #include "chrome/browser/aeropeek_manager.h" | 87 #include "chrome/browser/aeropeek_manager.h" |
| 88 #include "chrome/browser/jumplist_win.h" | 88 #include "chrome/browser/jumplist_win.h" |
| 89 #elif defined(OS_LINUX) | 89 #elif defined(OS_LINUX) |
| 90 #include "chrome/browser/views/accelerator_table_gtk.h" | 90 #include "chrome/browser/views/accelerator_table_gtk.h" |
| 91 #include "views/window/hit_test.h" | 91 #include "views/window/hit_test.h" |
| 92 #include "views/window/window_gtk.h" | 92 #include "views/window/window_gtk.h" |
| 93 #endif | 93 #endif |
| 94 | 94 |
| 95 #if defined(OS_CHROMEOS) |
| 96 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h" |
| 97 #endif |
| 98 |
| 95 using base::TimeDelta; | 99 using base::TimeDelta; |
| 96 using views::ColumnSet; | 100 using views::ColumnSet; |
| 97 using views::GridLayout; | 101 using views::GridLayout; |
| 98 | 102 |
| 99 // The height of the status bubble. | 103 // The height of the status bubble. |
| 100 static const int kStatusBubbleHeight = 20; | 104 static const int kStatusBubbleHeight = 20; |
| 101 // The name of a key to store on the window handle so that other code can | 105 // The name of a key to store on the window handle so that other code can |
| 102 // locate this object using just the handle. | 106 // locate this object using just the handle. |
| 103 static const char* const kBrowserViewKey = "__BROWSER_VIEW__"; | 107 static const char* const kBrowserViewKey = "__BROWSER_VIEW__"; |
| 104 // How frequently we check for hung plugin windows. | 108 // How frequently we check for hung plugin windows. |
| (...skipping 1271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1376 contents_->SetPreview(NULL, NULL); | 1380 contents_->SetPreview(NULL, NULL); |
| 1377 delete preview_container_; | 1381 delete preview_container_; |
| 1378 preview_container_ = NULL; | 1382 preview_container_ = NULL; |
| 1379 contents_->RemoveFade(); | 1383 contents_->RemoveFade(); |
| 1380 } | 1384 } |
| 1381 | 1385 |
| 1382 gfx::Rect BrowserView::GetInstantBounds() { | 1386 gfx::Rect BrowserView::GetInstantBounds() { |
| 1383 return contents_->GetPreviewBounds(); | 1387 return contents_->GetPreviewBounds(); |
| 1384 } | 1388 } |
| 1385 | 1389 |
| 1390 #if defined(OS_CHROMEOS) |
| 1391 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { |
| 1392 KeyboardOverlayDelegate::ShowDialog(owning_window); |
| 1393 } |
| 1394 #endif |
| 1395 |
| 1386 /////////////////////////////////////////////////////////////////////////////// | 1396 /////////////////////////////////////////////////////////////////////////////// |
| 1387 // BrowserView, BrowserWindowTesting implementation: | 1397 // BrowserView, BrowserWindowTesting implementation: |
| 1388 | 1398 |
| 1389 BookmarkBarView* BrowserView::GetBookmarkBarView() const { | 1399 BookmarkBarView* BrowserView::GetBookmarkBarView() const { |
| 1390 return bookmark_bar_view_.get(); | 1400 return bookmark_bar_view_.get(); |
| 1391 } | 1401 } |
| 1392 | 1402 |
| 1393 LocationBarView* BrowserView::GetLocationBarView() const { | 1403 LocationBarView* BrowserView::GetLocationBarView() const { |
| 1394 return toolbar_->location_bar(); | 1404 return toolbar_->location_bar(); |
| 1395 } | 1405 } |
| (...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2498 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2508 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
| 2499 | 2509 |
| 2500 return view; | 2510 return view; |
| 2501 } | 2511 } |
| 2502 #endif | 2512 #endif |
| 2503 | 2513 |
| 2504 // static | 2514 // static |
| 2505 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2515 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2506 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2516 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2507 } | 2517 } |
| OLD | NEW |