| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1524 } | 1524 } |
| 1525 | 1525 |
| 1526 void BrowserView::Paste() { | 1526 void BrowserView::Paste() { |
| 1527 DoCutCopyPaste(&content::RenderWidgetHost::Paste, | 1527 DoCutCopyPaste(&content::RenderWidgetHost::Paste, |
| 1528 #if defined(OS_WIN) | 1528 #if defined(OS_WIN) |
| 1529 WM_PASTE, | 1529 WM_PASTE, |
| 1530 #endif | 1530 #endif |
| 1531 IDS_APP_PASTE); | 1531 IDS_APP_PASTE); |
| 1532 } | 1532 } |
| 1533 | 1533 |
| 1534 #if defined(USE_ASH) |
| 1535 bool BrowserView::IsImmersiveMode() const { |
| 1536 return immersive_mode_controller_->enabled(); |
| 1537 } |
| 1538 #endif |
| 1539 |
| 1534 gfx::Rect BrowserView::GetInstantBounds() { | 1540 gfx::Rect BrowserView::GetInstantBounds() { |
| 1535 return contents_->GetPreviewBounds(); | 1541 return contents_->GetPreviewBounds(); |
| 1536 } | 1542 } |
| 1537 | 1543 |
| 1538 bool BrowserView::IsInstantTabShowing() { | 1544 bool BrowserView::IsInstantTabShowing() { |
| 1539 return preview_controller_->preview() != NULL; | 1545 return preview_controller_->preview() != NULL; |
| 1540 } | 1546 } |
| 1541 | 1547 |
| 1542 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( | 1548 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( |
| 1543 const gfx::Rect& bounds) { | 1549 const gfx::Rect& bounds) { |
| (...skipping 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2817 modal_browser->window()->Activate(); | 2823 modal_browser->window()->Activate(); |
| 2818 } | 2824 } |
| 2819 | 2825 |
| 2820 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2826 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
| 2821 } | 2827 } |
| 2822 | 2828 |
| 2823 void BrowserView::MaybeStackBookmarkBarAtTop() { | 2829 void BrowserView::MaybeStackBookmarkBarAtTop() { |
| 2824 if (bookmark_bar_view_.get()) | 2830 if (bookmark_bar_view_.get()) |
| 2825 bookmark_bar_view_->MaybeStackAtTop(); | 2831 bookmark_bar_view_->MaybeStackAtTop(); |
| 2826 } | 2832 } |
| OLD | NEW |