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

Side by Side Diff: chrome/browser/ui/views/constrained_window_views.cc

Issue 14192005: Remove frame from new style web view dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/views/constrained_window_views.h" 5 #include "chrome/browser/ui/views/constrained_window_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 WebContentsModalDialogHost* dialog_host) { 630 WebContentsModalDialogHost* dialog_host) {
631 views::Widget* dialog = new views::Widget; 631 views::Widget* dialog = new views::Widget;
632 632
633 views::Widget::InitParams params; 633 views::Widget::InitParams params;
634 params.delegate = widget_delegate; 634 params.delegate = widget_delegate;
635 params.child = true; 635 params.child = true;
636 WebContentsModalDialogHostObserver* dialog_host_observer = NULL; 636 WebContentsModalDialogHostObserver* dialog_host_observer = NULL;
637 if (views::DialogDelegate::UseNewStyle()) { 637 if (views::DialogDelegate::UseNewStyle()) {
638 params.parent = 638 params.parent =
639 views::Widget::GetTopLevelWidgetForNativeView(parent)->GetNativeView(); 639 views::Widget::GetTopLevelWidgetForNativeView(parent)->GetNativeView();
640 params.remove_standard_frame = true;
640 dialog_host_observer = 641 dialog_host_observer =
641 new WebContentsModalDialogHostObserverViews( 642 new WebContentsModalDialogHostObserverViews(
642 dialog_host, 643 dialog_host,
643 dialog, 644 dialog,
644 kWebContentsModalDialogHostObserverViewsKey); 645 kWebContentsModalDialogHostObserverViewsKey);
645 } else { 646 } else {
646 params.parent = parent; 647 params.parent = parent;
647 } 648 }
648 649
649 dialog->Init(params); 650 dialog->Init(params);
(...skipping 13 matching lines...) Expand all
663 if (views::DialogDelegate::UseNewStyle()) 664 if (views::DialogDelegate::UseNewStyle())
664 return views::DialogDelegate::CreateNewStyleFrameView(widget); 665 return views::DialogDelegate::CreateNewStyleFrameView(widget);
665 #if defined(USE_ASH) 666 #if defined(USE_ASH)
666 ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh; 667 ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh;
667 frame->Init(widget); 668 frame->Init(widget);
668 return frame; 669 return frame;
669 #endif 670 #endif
670 return new ConstrainedWindowFrameView(widget, 671 return new ConstrainedWindowFrameView(widget,
671 browser_context->IsOffTheRecord()); 672 browser_context->IsOffTheRecord());
672 } 673 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698