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

Unified Diff: chrome/browser/ui/views/constrained_window_views.cc

Issue 11421164: Migrate CollectedCookiesViews to Chrome style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
Index: chrome/browser/ui/views/constrained_window_views.cc
diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc
index d39375028b6ccb8cdc88b6ed5f6cd5efb9018759..e37210a32586ea21577a24dc1181db6234d48a35 100644
--- a/chrome/browser/ui/views/constrained_window_views.cc
+++ b/chrome/browser/ui/views/constrained_window_views.cc
@@ -564,11 +564,11 @@ ConstrainedWindowViews::ConstrainedWindowViews(
content::WebContents* web_contents,
views::WidgetDelegate* widget_delegate,
bool enable_chrome_style,
- ChromeStyleClientInsets chrome_style_client_insets)
+ ChromeStyleFrameLayout chrome_style_frame_layout)
: WebContentsObserver(web_contents),
web_contents_(web_contents),
enable_chrome_style_(enable_chrome_style),
- chrome_style_client_insets_(chrome_style_client_insets),
+ chrome_style_frame_layout_(chrome_style_frame_layout),
ALLOW_THIS_IN_INITIALIZER_LIST(native_constrained_window_(
NativeConstrainedWindow::CreateNativeConstrainedWindow(this))) {
views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
@@ -691,7 +691,7 @@ void ConstrainedWindowViews::CenterWindow(const gfx::Size& size) {
views::NonClientFrameView* ConstrainedWindowViews::CreateNonClientFrameView() {
if (enable_chrome_style_)
- return new ConstrainedWindowFrameSimple(this, chrome_style_client_insets_);
+ return new ConstrainedWindowFrameSimple(this, chrome_style_frame_layout_);
#if defined(USE_ASH)
CommandLine* command_line = CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(ash::switches::kAuraGoogleDialogFrames))
« no previous file with comments | « chrome/browser/ui/views/constrained_window_views.h ('k') | chrome/browser/ui/views/constrained_window_views_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698