Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6271)

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1251633002: Add BubbleManager to manage bubbles and ChromeBubbleManager for events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac Changes to test trybots Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 2449b69003ea3295d62480d00d5bf02890dbf011..d02bb7887c856398500353a514c10057202e7a48 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -51,6 +51,7 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window_state.h"
+#include "chrome/browser/ui/chrome_bubble_manager.h"
#include "chrome/browser/ui/search/search_delegate.h"
#include "chrome/browser/ui/search/search_model.h"
#include "chrome/browser/ui/search/search_ui.h"
@@ -878,6 +879,7 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents,
->DisplayPendingRequests(browser_.get());
}
+ browser_->bubble_manager()->TabFocus();
msw 2015/08/18 17:26:19 Remove this, it should be handled by making Chrome
hcarmona 2015/08/18 23:08:48 Done.
UpdateUIForContents(new_contents);
// Layout for DevTools _before_ setting the both main and devtools WebContents
@@ -1559,6 +1561,7 @@ void BrowserView::TabInsertedAt(WebContents* contents,
}
void BrowserView::TabDetachedAt(WebContents* contents, int index) {
+ browser_->bubble_manager()->TabDetached();
msw 2015/08/18 17:26:19 Ditto: Remove this, it should be handled by making
hcarmona 2015/08/18 23:08:47 Done.
if (PermissionBubbleManager::FromWebContents(contents))
PermissionBubbleManager::FromWebContents(contents)->HideBubble();
@@ -1577,6 +1580,7 @@ void BrowserView::TabDetachedAt(WebContents* contents, int index) {
}
void BrowserView::TabDeactivated(WebContents* contents) {
+ browser_->bubble_manager()->TabBlur();
msw 2015/08/18 17:26:19 Ditto: Remove this, it should be handled by making
hcarmona 2015/08/18 23:08:47 Done.
if (PermissionBubbleManager::FromWebContents(contents))
PermissionBubbleManager::FromWebContents(contents)->HideBubble();
@@ -2322,6 +2326,7 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
+ browser_->bubble_manager()->FullscreenToggle();
msw 2015/08/18 17:26:19 This was already triggered via browser_->WindowFul
hcarmona 2015/08/18 23:08:48 Done.
WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
if (contents && PermissionBubbleManager::FromWebContents(contents))
PermissionBubbleManager::FromWebContents(contents)->UpdateAnchorPosition();

Powered by Google App Engine
This is Rietveld 408576698