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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 9702054: Revert 126764 - Added notion of currently active app / browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 views::View* BrowserView::GetContentsView() { 1632 views::View* BrowserView::GetContentsView() {
1633 return contents_container_; 1633 return contents_container_;
1634 } 1634 }
1635 1635
1636 views::ClientView* BrowserView::CreateClientView(views::Widget* widget) { 1636 views::ClientView* BrowserView::CreateClientView(views::Widget* widget) {
1637 return this; 1637 return this;
1638 } 1638 }
1639 1639
1640 void BrowserView::OnWidgetActivationChanged(views::Widget* widget, 1640 void BrowserView::OnWidgetActivationChanged(views::Widget* widget,
1641 bool active) { 1641 bool active) {
1642 #if defined(USE_AURA)
1643 if (icon_updater_.get())
1644 icon_updater_->BrowserActivationStateChanged();
1645 #endif
1646
1647 if (active) { 1642 if (active) {
1648 BrowserList::SetLastActive(browser_.get()); 1643 BrowserList::SetLastActive(browser_.get());
1649 browser_->OnWindowActivated(); 1644 browser_->OnWindowActivated();
1650 } 1645 }
1651 } 1646 }
1652 1647
1653 void BrowserView::OnWindowBeginUserBoundsChange() { 1648 void BrowserView::OnWindowBeginUserBoundsChange() {
1654 WebContents* web_contents = GetSelectedWebContents(); 1649 WebContents* web_contents = GetSelectedWebContents();
1655 if (!web_contents) 1650 if (!web_contents)
1656 return; 1651 return;
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
2577 browser::CreateViewsBubble(bubble); 2572 browser::CreateViewsBubble(bubble);
2578 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); 2573 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
2579 bubble->Show(); 2574 bubble->Show();
2580 } 2575 }
2581 2576
2582 void BrowserView::ShowAvatarBubbleFromAvatarButton() { 2577 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
2583 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); 2578 AvatarMenuButton* button = frame_->GetAvatarMenuButton();
2584 if (button) 2579 if (button)
2585 button->ShowAvatarBubble(); 2580 button->ShowAvatarBubble();
2586 } 2581 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc ('k') | content/test/test_renderer_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698