| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1387 } | 1387 } |
| 1388 | 1388 |
| 1389 gfx::Rect BrowserView::GetInstantBounds() { | 1389 gfx::Rect BrowserView::GetInstantBounds() { |
| 1390 return contents_->GetPreviewBounds(); | 1390 return contents_->GetPreviewBounds(); |
| 1391 } | 1391 } |
| 1392 | 1392 |
| 1393 bool BrowserView::IsInstantTabShowing() { | 1393 bool BrowserView::IsInstantTabShowing() { |
| 1394 return preview_container_ != NULL; | 1394 return preview_container_ != NULL; |
| 1395 } | 1395 } |
| 1396 | 1396 |
| 1397 void BrowserView::SetInstantHasCustomLogo(bool has_logo) { |
| 1398 #if defined(USE_AURA) |
| 1399 search_view_controller_->SetInstantHasCustomLogo(has_logo); |
| 1400 #endif |
| 1401 } |
| 1402 |
| 1397 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( | 1403 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( |
| 1398 const gfx::Rect& bounds) { | 1404 const gfx::Rect& bounds) { |
| 1399 #if defined(OS_WIN) | 1405 #if defined(OS_WIN) |
| 1400 #if defined(USE_AURA) | 1406 #if defined(USE_AURA) |
| 1401 return NEW_POPUP; | 1407 return NEW_POPUP; |
| 1402 #else | 1408 #else |
| 1403 // If we are in windows metro-mode, we can't allow popup windows. | 1409 // If we are in windows metro-mode, we can't allow popup windows. |
| 1404 return base::win::IsMetroProcess() ? NEW_BACKGROUND_TAB : NEW_POPUP; | 1410 return base::win::IsMetroProcess() ? NEW_BACKGROUND_TAB : NEW_POPUP; |
| 1405 #endif | 1411 #endif |
| 1406 #else | 1412 #else |
| (...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2679 | 2685 |
| 2680 Browser* modal_browser = | 2686 Browser* modal_browser = |
| 2681 browser::FindBrowserWithWebContents(active_dialog->web_contents()); | 2687 browser::FindBrowserWithWebContents(active_dialog->web_contents()); |
| 2682 if (modal_browser && (browser_ != modal_browser)) { | 2688 if (modal_browser && (browser_ != modal_browser)) { |
| 2683 modal_browser->window()->FlashFrame(true); | 2689 modal_browser->window()->FlashFrame(true); |
| 2684 modal_browser->window()->Activate(); | 2690 modal_browser->window()->Activate(); |
| 2685 } | 2691 } |
| 2686 | 2692 |
| 2687 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2693 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
| 2688 } | 2694 } |
| OLD | NEW |