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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
478 return static_cast<BrowserView*>(browser->window()); | 478 return static_cast<BrowserView*>(browser->window()); |
479 } | 479 } |
480 | 480 |
481 void BrowserView::InitStatusBubble() { | 481 void BrowserView::InitStatusBubble() { |
482 status_bubble_.reset(new StatusBubbleViews(contents_web_view_)); | 482 status_bubble_.reset(new StatusBubbleViews(contents_web_view_)); |
483 contents_web_view_->SetStatusBubble(status_bubble_.get()); | 483 contents_web_view_->SetStatusBubble(status_bubble_.get()); |
484 } | 484 } |
485 | 485 |
486 void BrowserView::InitPermissionBubbleView() { | 486 void BrowserView::InitPermissionBubbleView() { |
487 permission_bubble_view_.reset(new PermissionBubbleViewViews( | 487 permission_bubble_view_.reset(new PermissionBubbleViewViews( |
488 GetLocationBarView()->GetLocationIconView())); | 488 GetLocationBarView()->location_icon_view())); |
489 } | 489 } |
490 | 490 |
491 gfx::Rect BrowserView::GetToolbarBounds() const { | 491 gfx::Rect BrowserView::GetToolbarBounds() const { |
492 gfx::Rect toolbar_bounds(toolbar_->bounds()); | 492 gfx::Rect toolbar_bounds(toolbar_->bounds()); |
493 if (toolbar_bounds.IsEmpty()) | 493 if (toolbar_bounds.IsEmpty()) |
494 return toolbar_bounds; | 494 return toolbar_bounds; |
495 // The apparent toolbar edges are outside the "real" toolbar edges. | 495 // The apparent toolbar edges are outside the "real" toolbar edges. |
496 toolbar_bounds.Inset(-views::NonClientFrameView::kClientEdgeThickness, 0); | 496 toolbar_bounds.Inset(-views::NonClientFrameView::kClientEdgeThickness, 0); |
497 return toolbar_bounds; | 497 return toolbar_bounds; |
498 } | 498 } |
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1246 contents_web_view_->OnWebContentsFocused(contents); | 1246 contents_web_view_->OnWebContentsFocused(contents); |
1247 else | 1247 else |
1248 devtools_web_view_->OnWebContentsFocused(contents); | 1248 devtools_web_view_->OnWebContentsFocused(contents); |
1249 } | 1249 } |
1250 | 1250 |
1251 void BrowserView::ShowWebsiteSettings(Profile* profile, | 1251 void BrowserView::ShowWebsiteSettings(Profile* profile, |
1252 content::WebContents* web_contents, | 1252 content::WebContents* web_contents, |
1253 const GURL& url, | 1253 const GURL& url, |
1254 const content::SSLStatus& ssl) { | 1254 const content::SSLStatus& ssl) { |
1255 WebsiteSettingsPopupView::ShowPopup( | 1255 WebsiteSettingsPopupView::ShowPopup( |
1256 GetLocationBarView()->GetLocationIconView(), profile, | 1256 GetLocationBarView()->location_icon_view(), profile, |
1257 web_contents, url, ssl, browser_.get()); | 1257 web_contents, url, ssl, browser_.get()); |
1258 } | 1258 } |
1259 | 1259 |
1260 void BrowserView::ShowAppMenu() { | 1260 void BrowserView::ShowAppMenu() { |
1261 // Keep the top-of-window views revealed as long as the app menu is visible. | 1261 // Keep the top-of-window views revealed as long as the app menu is visible. |
1262 scoped_ptr<ImmersiveRevealedLock> revealed_lock( | 1262 scoped_ptr<ImmersiveRevealedLock> revealed_lock( |
1263 immersive_mode_controller_->GetRevealedLock( | 1263 immersive_mode_controller_->GetRevealedLock( |
1264 ImmersiveModeController::ANIMATE_REVEAL_NO)); | 1264 ImmersiveModeController::ANIMATE_REVEAL_NO)); |
1265 | 1265 |
1266 toolbar_->app_menu()->Activate(); | 1266 toolbar_->app_menu()->Activate(); |
(...skipping 1266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2533 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { | 2533 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { |
2534 gfx::Point icon_bottom( | 2534 gfx::Point icon_bottom( |
2535 toolbar_->location_bar()->GetLocationBarAnchorPoint()); | 2535 toolbar_->location_bar()->GetLocationBarAnchorPoint()); |
2536 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); | 2536 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); |
2537 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2537 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
2538 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2538 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
2539 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2539 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
2540 } | 2540 } |
2541 return top_arrow_height; | 2541 return top_arrow_height; |
2542 } | 2542 } |
OLD | NEW |