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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_container.cc

Issue 10854017: Basic metro snap view omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos compilation. Created 8 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/location_bar/location_bar_container.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_container.cc b/chrome/browser/ui/views/location_bar/location_bar_container.cc
index 805c1322060b64377ae63dfc97cd61b512cef4c6..db01067ebb367c90dc1726afeef8be4c06c2bf4a 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_container.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_container.cc
@@ -38,7 +38,12 @@ LocationBarContainer::~LocationBarContainer() {
}
void LocationBarContainer::SetLocationBarView(LocationBarView* view) {
- DCHECK(!location_bar_view_ && view);
+ DCHECK(view);
+
+ if (location_bar_view_) {
+ view_parent_->RemoveChildView(location_bar_view_);
+ }
+
location_bar_view_ = view;
view_parent_->AddChildView(location_bar_view_);
DCHECK_EQ(1, view_parent_->child_count()); // Only support one child.

Powered by Google App Engine
This is Rietveld 408576698