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

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

Issue 13588007: Implement WebContentsModalDialogManagerDelegate for ShellWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add OVERRIDEs 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
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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 : public views::WidgetObserver, 85 : public views::WidgetObserver,
86 public WebContentsModalDialogHostObserver { 86 public WebContentsModalDialogHostObserver {
87 public: 87 public:
88 WebContentsModalDialogHostObserverViews( 88 WebContentsModalDialogHostObserverViews(
89 WebContentsModalDialogHost* host, 89 WebContentsModalDialogHost* host,
90 views::Widget* target_widget, 90 views::Widget* target_widget,
91 const char *const native_window_property) 91 const char *const native_window_property)
92 : host_(host), 92 : host_(host),
93 target_widget_(target_widget), 93 target_widget_(target_widget),
94 native_window_property_(native_window_property) { 94 native_window_property_(native_window_property) {
95 DCHECK(host_);
96 DCHECK(target_widget_);
95 host_->AddObserver(this); 97 host_->AddObserver(this);
96 target_widget_->AddObserver(this); 98 target_widget_->AddObserver(this);
97 } 99 }
98 100
99 virtual ~WebContentsModalDialogHostObserverViews() { 101 virtual ~WebContentsModalDialogHostObserverViews() {
100 host_->RemoveObserver(this); 102 host_->RemoveObserver(this);
101 target_widget_->RemoveObserver(this); 103 target_widget_->RemoveObserver(this);
102 target_widget_->SetNativeWindowProperty(native_window_property_, 104 target_widget_->SetNativeWindowProperty(native_window_property_,
103 NULL); 105 NULL);
104 } 106 }
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 if (views::DialogDelegate::UseNewStyle()) 663 if (views::DialogDelegate::UseNewStyle())
662 return views::DialogDelegate::CreateNewStyleFrameView(widget); 664 return views::DialogDelegate::CreateNewStyleFrameView(widget);
663 #if defined(USE_ASH) 665 #if defined(USE_ASH)
664 ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh; 666 ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh;
665 frame->Init(widget); 667 frame->Init(widget);
666 return frame; 668 return frame;
667 #endif 669 #endif
668 return new ConstrainedWindowFrameView(widget, 670 return new ConstrainedWindowFrameView(widget,
669 browser_context->IsOffTheRecord()); 671 browser_context->IsOffTheRecord());
670 } 672 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698