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

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

Issue 12045037: Refactor modality-specific behavior from ConstrainedWindowViews to WebContentsModalDialogManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Android link error Created 7 years, 10 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 <algorithm> 5 #include <algorithm>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 waiting_view_(NULL), 1083 waiting_view_(NULL),
1084 can_close_(true) { 1084 can_close_(true) {
1085 use_close_button_ = false; 1085 use_close_button_ = false;
1086 1086
1087 model_->set_observer(this); 1087 model_->set_observer(this);
1088 contents_ = new views::View(); 1088 contents_ = new views::View();
1089 contents_->set_background(views::Background::CreateSolidBackground( 1089 contents_->set_background(views::Background::CreateSolidBackground(
1090 chrome_style::GetBackgroundColor())); 1090 chrome_style::GetBackgroundColor()));
1091 1091
1092 // Show the dialog. 1092 // Show the dialog.
1093 window_ = new ConstrainedWindowViews(web_contents, this); 1093 window_ = ConstrainedWindowViews::Create(web_contents, this);
1094 if (model_->IsInlineDisposition()) 1094 if (model_->IsInlineDisposition())
1095 OnInlineDisposition(string16(), model_->inline_disposition_url()); 1095 OnInlineDisposition(string16(), model_->inline_disposition_url());
1096 else 1096 else
1097 UpdateContents(); 1097 UpdateContents();
1098 } 1098 }
1099 1099
1100 WebIntentPickerViews::~WebIntentPickerViews() { 1100 WebIntentPickerViews::~WebIntentPickerViews() {
1101 model_->set_observer(NULL); 1101 model_->set_observer(NULL);
1102 } 1102 }
1103 1103
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 if (inline_service) 1592 if (inline_service)
1593 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia()); 1593 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia());
1594 } 1594 }
1595 1595
1596 void WebIntentPickerViews::RefreshExtensions() { 1596 void WebIntentPickerViews::RefreshExtensions() {
1597 DCHECK(extensions_); 1597 DCHECK(extensions_);
1598 extensions_->Update(); 1598 extensions_->Update();
1599 contents_->Layout(); 1599 contents_->Layout();
1600 SizeToContents(); 1600 SizeToContents();
1601 } 1601 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698