chrome/browser/ui/views/frame/contents_container.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/frame/contents_container.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/frame/browser_view_layout.cc ('k') | chrome/browser/ui/views/frame/glass_browser_frame_view.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/views/frame/contents_container.h"	5 #include "chrome/browser/ui/views/frame/contents_container.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "third_party/skia/include/core/SkColor.h"	8 #include "third_party/skia/include/core/SkColor.h"

9 #include "ui/base/animation/slide_animation.h"	9 #include "ui/base/animation/slide_animation.h"

10 #include "views/background.h"	10 #include "views/background.h"

11 #include "views/widget/root_view.h"	11 #include "views/widget/root_view.h"

12 #include "views/widget/widget.h"	12 #include "views/widget/widget.h"

13	13

14 // Min/max opacity of the overlay.	14 // Min/max opacity of the overlay.

15 static const int kMinOpacity = 0;	15 static const int kMinOpacity = 0;

(...skipping 149 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 views::Background::CreateSolidBackground(SK_ColorWHITE));	165 views::Background::CreateSolidBackground(SK_ColorWHITE));

166 active_overlay_->SetContentsView(overlay_view_);	166 active_overlay_->SetContentsView(overlay_view_);

167 active_overlay_->Show();	167 active_overlay_->Show();

168 active_overlay_->MoveAbove(active_->GetWidget());	168 active_overlay_->MoveAbove(active_->GetWidget());

169 }	169 }

170	170

171 void ContentsContainer::OverlayViewDestroyed() {	171 void ContentsContainer::OverlayViewDestroyed() {

172 active_overlay_ = NULL;	172 active_overlay_ = NULL;

173 overlay_view_ = NULL;	173 overlay_view_ = NULL;

174 }	174 }

OLD	NEW