| 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 1221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1232 | 1232 |
| 1233 void BrowserView::ShowUpdateChromeDialog() { | 1233 void BrowserView::ShowUpdateChromeDialog() { |
| 1234 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); | 1234 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); |
| 1235 } | 1235 } |
| 1236 | 1236 |
| 1237 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { | 1237 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { |
| 1238 scoped_ptr<BookmarkBubbleDelegate> delegate; | 1238 scoped_ptr<BookmarkBubbleDelegate> delegate; |
| 1239 delegate.reset(new BookmarkBubbleSignInDelegate(browser_.get())); | 1239 delegate.reset(new BookmarkBubbleSignInDelegate(browser_.get())); |
| 1240 | 1240 |
| 1241 BookmarkBubbleView::ShowBubble(GetToolbarView()->GetBookmarkBubbleAnchor(), | 1241 BookmarkBubbleView::ShowBubble(GetToolbarView()->GetBookmarkBubbleAnchor(), |
| 1242 bookmark_bar_view_.get(), | 1242 gfx::Rect(), nullptr, bookmark_bar_view_.get(), |
| 1243 delegate.Pass(), | 1243 delegate.Pass(), browser_->profile(), url, |
| 1244 browser_->profile(), | |
| 1245 url, | |
| 1246 !already_bookmarked); | 1244 !already_bookmarked); |
| 1247 } | 1245 } |
| 1248 | 1246 |
| 1249 void BrowserView::ShowBookmarkAppBubble( | 1247 void BrowserView::ShowBookmarkAppBubble( |
| 1250 const WebApplicationInfo& web_app_info, | 1248 const WebApplicationInfo& web_app_info, |
| 1251 const ShowBookmarkAppBubbleCallback& callback) { | 1249 const ShowBookmarkAppBubbleCallback& callback) { |
| 1252 BookmarkAppBubbleView::ShowBubble(GetToolbarView(), web_app_info, callback); | 1250 BookmarkAppBubbleView::ShowBubble(GetToolbarView(), web_app_info, callback); |
| 1253 } | 1251 } |
| 1254 | 1252 |
| 1255 void BrowserView::ShowTranslateBubble( | 1253 void BrowserView::ShowTranslateBubble( |
| (...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2618 return immersive_mode_controller()->IsEnabled(); | 2616 return immersive_mode_controller()->IsEnabled(); |
| 2619 } | 2617 } |
| 2620 | 2618 |
| 2621 views::Widget* BrowserView::GetBubbleAssociatedWidget() { | 2619 views::Widget* BrowserView::GetBubbleAssociatedWidget() { |
| 2622 return GetWidget(); | 2620 return GetWidget(); |
| 2623 } | 2621 } |
| 2624 | 2622 |
| 2625 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { | 2623 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { |
| 2626 return top_container_->GetBoundsInScreen(); | 2624 return top_container_->GetBoundsInScreen(); |
| 2627 } | 2625 } |
| OLD | NEW |