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

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

Issue 9590001: Launch panels as popup windows in Aura, and add separate launcher icon logic for panels. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 8 years, 10 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
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4b03764dd09b74c399403cf991233ac5617e45e1..a92e62d201af685a693b3ae7abcf57d348b2000e 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -591,10 +591,7 @@ void BrowserView::Show() {
return;
}
-#if defined(USE_AURA)
- if (!icon_updater_.get())
- icon_updater_.reset(LauncherUpdater::Create(browser_.get()));
-#endif // defined(USE_AURA)
+ CreateLauncherIcon();
// Showing the window doesn't make the browser window active right away.
// This can cause SetFocusToLocationBar() to skip setting focus to the
@@ -622,8 +619,10 @@ void BrowserView::Show() {
}
void BrowserView::ShowInactive() {
- if (!frame_->IsVisible())
- frame_->ShowInactive();
+ if (frame_->IsVisible())
+ return;
+ CreateLauncherIcon();
+ frame_->ShowInactive();
}
void BrowserView::SetBounds(const gfx::Rect& bounds) {
@@ -2536,6 +2535,13 @@ void BrowserView::SetToolbar(ToolbarView* toolbar) {
}
}
+void BrowserView::CreateLauncherIcon() {
+#if defined(USE_AURA)
+ if (!icon_updater_.get())
+ icon_updater_.reset(LauncherUpdater::Create(browser_.get()));
+#endif // defined(USE_AURA)
+}
+
#if !defined(OS_CHROMEOS) || defined(USE_AURA)
// static
BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698