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

Side by Side Diff: chrome/browser/chromeos/first_run/first_run_view.cc

Issue 654123004: Revert of Sets the default background color of inline signin and user manager to grey (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/chromeos/first_run/first_run_view.h" 5 #include "chrome/browser/chromeos/first_run/first_run_view.h"
6 6
7 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 7 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
8 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h" 8 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
9 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
10 #include "content/public/browser/render_view_host.h" 10 #include "content/public/browser/render_view_host.h"
(...skipping 13 matching lines...) Expand all
24 void FirstRunView::Init(content::BrowserContext* context) { 24 void FirstRunView::Init(content::BrowserContext* context) {
25 web_view_ = new views::WebView(context); 25 web_view_ = new views::WebView(context);
26 AddChildView(web_view_); 26 AddChildView(web_view_);
27 web_view_->LoadInitialURL(GURL(chrome::kChromeUIFirstRunURL)); 27 web_view_->LoadInitialURL(GURL(chrome::kChromeUIFirstRunURL));
28 28
29 content::WebContents* web_contents = web_view_->web_contents(); 29 content::WebContents* web_contents = web_view_->web_contents();
30 web_contents->SetDelegate(this); 30 web_contents->SetDelegate(this);
31 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( 31 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
32 web_contents); 32 web_contents);
33 33
34 web_contents->GetRenderViewHost()->GetView()->SetBackgroundColor( 34 web_contents->GetRenderViewHost()->GetView()->SetBackgroundOpaque(false);
35 SK_ColorTRANSPARENT);
36 } 35 }
37 36
38 FirstRunActor* FirstRunView::GetActor() { 37 FirstRunActor* FirstRunView::GetActor() {
39 return static_cast<FirstRunUI*>( 38 return static_cast<FirstRunUI*>(
40 web_view_->web_contents()->GetWebUI()->GetController())->get_actor(); 39 web_view_->web_contents()->GetWebUI()->GetController())->get_actor();
41 } 40 }
42 41
43 void FirstRunView::Layout() { 42 void FirstRunView::Layout() {
44 web_view_->SetBoundsRect(bounds()); 43 web_view_->SetBoundsRect(bounds());
45 } 44 }
(...skipping 16 matching lines...) Expand all
62 content::WebContents* source, 61 content::WebContents* source,
63 const blink::WebGestureEvent& event) { 62 const blink::WebGestureEvent& event) {
64 // Disable pinch zooming. 63 // Disable pinch zooming.
65 return event.type == blink::WebGestureEvent::GesturePinchBegin || 64 return event.type == blink::WebGestureEvent::GesturePinchBegin ||
66 event.type == blink::WebGestureEvent::GesturePinchUpdate || 65 event.type == blink::WebGestureEvent::GesturePinchUpdate ||
67 event.type == blink::WebGestureEvent::GesturePinchEnd; 66 event.type == blink::WebGestureEvent::GesturePinchEnd;
68 } 67 }
69 68
70 } // namespace chromeos 69 } // namespace chromeos
71 70
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698