summaryrefslogtreecommitdiffstats
path: root/content/public/browser/web_contents.h
diff options
context:
space:
mode:
authorccameron <ccameron@chromium.org>2015-05-05 16:07:42 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-05 23:08:16 +0000
commite8c43faf256fb877d783287b347f8beb38b7495a (patch)
tree54ebd91f37e3f24b2af673c87a1b657a9bb6a834 /content/public/browser/web_contents.h
parent0cf980df57c5251ad82d23e3e5d3cdc97950dc7e (diff)
downloadchromium_src-e8c43faf256fb877d783287b347f8beb38b7495a.zip
chromium_src-e8c43faf256fb877d783287b347f8beb38b7495a.tar.gz
chromium_src-e8c43faf256fb877d783287b347f8beb38b7495a.tar.bz2
Mac: Ensure that web contents background matches theme
Have the TabContentsContainerView send the theme's background color down to the WebContentsViewCocoa. Make the RenderWidgetHostViewCocoa be transparent, so that the WebContentsViewCocoa which is always behind it shows. Simplify the computation of the blended background color for the TabContentsContainerView. Also fix a bug in TabContentsController where calls to [self view] in dealloc would cause the TabContentsContainerView to be lazily allocated (only to be immediately destroyed). This was causing as this allocate-while-being-destroyed arrangement was creating poorly defined states, which would now be tickled more because of the calls to SetBackgroundColor that were inserted. BUG=470669 Review URL: https://codereview.chromium.org/1124813002 Cr-Commit-Position: refs/heads/master@{#328427}
Diffstat (limited to 'content/public/browser/web_contents.h')
-rw-r--r--content/public/browser/web_contents.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index a28df1c..0a79d26 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -650,6 +650,10 @@ class WebContents : public PageNavigator,
// Returns true if other views are allowed, false otherwise.
virtual bool GetAllowOtherViews() = 0;
+
+ // Set the background color which may be flashed if there is not content
+ // available yet.
+ virtual void SetBackgroundColor(SkColor background_color) = 0;
#endif // OS_ANDROID
private: