Keep app default zoom level independent of the browser zoom level.

This was mostly done already with the defalut zoom level being stored
as a StoragePartition level preference. However when the renderer
preferences were set they did not use the default zoom of the correct
StoragePartition; the default StoragePartition's default zoom was
always used.

Due to this bug apps could easily have host specific zoom levels set
mistakenly. This change also removes any host specific zoom levels of
apps as they are started. If apps ever get the capability to zoom this
will need to be removed.

BUG=407333, 153568, 411073, 446759

Review URL: https://codereview.chromium.org/839023002

Cr-Commit-Position: refs/heads/master@{#311138}

3 files changed, 9 insertions, 4 deletions

diff --git a/extensions/browser/app_window/app_delegate.h b/extensions/browser/app_window/app_delegate.h
index 0e4477e..70f9f12 100644
--- a/extensions/browser/app_window/app_delegate.h
+++ b/extensions/browser/app_window/app_delegate.h
@@ -15,6 +15,7 @@ class BrowserContext;
 class ColorChooser;
 struct FileChooserParams;
 struct OpenURLParams;
+class RenderViewHost;
 class WebContents;
 }
 
@@ -35,6 +36,7 @@ class AppDelegate {
 
   // General initialization.
   virtual void InitWebContents(content::WebContents* web_contents) = 0;
+  virtual void RenderViewCreated(content::RenderViewHost* render_view_host) = 0;
 
   // Resizes WebContents.
   virtual void ResizeWebContents(content::WebContents* web_contents,
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index 9ed0342..db64d5f 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -254,10 +254,8 @@ void AppWindow::Init(const GURL& url,
   // Initialize the render interface and web contents
   app_window_contents_.reset(app_window_contents);
   app_window_contents_->Initialize(browser_context(), url);
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableAppsShowOnFirstPaint)) {
-    content::WebContentsObserver::Observe(web_contents());
-  }
+
+  content::WebContentsObserver::Observe(web_contents());
   app_delegate_->InitWebContents(web_contents());
 
   WebContentsModalDialogManager::CreateForWebContents(web_contents());
@@ -439,6 +437,10 @@ bool AppWindow::PreHandleGestureEvent(WebContents* source,
   return AppWebContentsHelper::ShouldSuppressGestureEvent(event);
 }
 
+void AppWindow::RenderViewCreated(content::RenderViewHost* render_view_host) {
+  app_delegate_->RenderViewCreated(render_view_host);
+}
+
 void AppWindow::DidFirstVisuallyNonEmptyPaint() {
   first_paint_complete_ = true;
   if (show_on_first_paint_) {
diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h
index 71db220..e218f81 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -409,6 +409,7 @@ class AppWindow : public content::NotificationObserver,
                              const blink::WebGestureEvent& event) override;
 
   // content::WebContentsObserver implementation.
+  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
   void DidFirstVisuallyNonEmptyPaint() override;
 
   // content::NotificationObserver implementation.