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

Unified Diff: chrome/browser/views/extensions/extension_view.cc

Issue 208020: Change the view mode when switching between moles and toolstrips, and (Closed)
Patch Set: build system workarounds Created 11 years, 3 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/views/extensions/extension_view.h ('k') | chrome/common/view_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/extensions/extension_view.cc
diff --git a/chrome/browser/views/extensions/extension_view.cc b/chrome/browser/views/extensions/extension_view.cc
index 7b39336b214dfc6534670b1c9a67522c10f8d2e8..4302c93993726e7b0a8f070f5226a34568174c35 100644
--- a/chrome/browser/views/extensions/extension_view.cc
+++ b/chrome/browser/views/extensions/extension_view.cc
@@ -15,7 +15,7 @@
ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser)
: host_(host), browser_(browser),
initialized_(false), pending_preferred_width_(0), container_(NULL),
- did_insert_css_(false), is_clipped_(false), is_toolstrip_(true) {
+ did_stop_loading_(false), is_clipped_(false), is_toolstrip_(true) {
host_->set_view(this);
}
@@ -34,8 +34,8 @@ RenderViewHost* ExtensionView::render_view_host() const {
return host_->render_view_host();
}
-void ExtensionView::SetDidInsertCSS(bool did_insert) {
- did_insert_css_ = did_insert;
+void ExtensionView::DidStopLoading() {
+ did_stop_loading_ = true;
ShowIfCompletelyLoaded();
}
@@ -100,7 +100,7 @@ void ExtensionView::ShowIfCompletelyLoaded() {
// given us a background and css has been inserted into page. These can happen
// in different orders.
if (!IsVisible() && host_->did_stop_loading() && render_view_host()->view() &&
- !is_clipped_ && did_insert_css_ &&
+ !is_clipped_ && did_stop_loading_ &&
!render_view_host()->view()->background().empty()) {
SetVisible(true);
UpdatePreferredWidth(pending_preferred_width_);
« no previous file with comments | « chrome/browser/views/extensions/extension_view.h ('k') | chrome/common/view_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698