| OLD | NEW |
| 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 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1085 can_close_(true) { | 1085 can_close_(true) { |
| 1086 bool enable_chrome_style = true; | 1086 bool enable_chrome_style = true; |
| 1087 use_close_button_ = enable_chrome_style; | 1087 use_close_button_ = enable_chrome_style; |
| 1088 | 1088 |
| 1089 model_->set_observer(this); | 1089 model_->set_observer(this); |
| 1090 contents_ = new views::View(); | 1090 contents_ = new views::View(); |
| 1091 contents_->set_background(views::Background::CreateSolidBackground( | 1091 contents_->set_background(views::Background::CreateSolidBackground( |
| 1092 ConstrainedWindow::GetBackgroundColor())); | 1092 ConstrainedWindow::GetBackgroundColor())); |
| 1093 | 1093 |
| 1094 // Show the dialog. | 1094 // Show the dialog. |
| 1095 window_ = new ConstrainedWindowViews(tab_contents->web_contents(), this, | 1095 window_ = new ConstrainedWindowViews( |
| 1096 enable_chrome_style, | 1096 tab_contents->web_contents(), |
| 1097 ConstrainedWindowViews::NO_INSETS); | 1097 this, |
| 1098 enable_chrome_style, |
| 1099 ConstrainedWindowViews::FRAME_LAYOUT_NONE); |
| 1098 if (model_->IsInlineDisposition()) | 1100 if (model_->IsInlineDisposition()) |
| 1099 OnInlineDisposition(string16(), model_->inline_disposition_url()); | 1101 OnInlineDisposition(string16(), model_->inline_disposition_url()); |
| 1100 else | 1102 else |
| 1101 UpdateContents(); | 1103 UpdateContents(); |
| 1102 } | 1104 } |
| 1103 | 1105 |
| 1104 WebIntentPickerViews::~WebIntentPickerViews() { | 1106 WebIntentPickerViews::~WebIntentPickerViews() { |
| 1105 model_->set_observer(NULL); | 1107 model_->set_observer(NULL); |
| 1106 } | 1108 } |
| 1107 | 1109 |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1595 if (inline_service) | 1597 if (inline_service) |
| 1596 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia()); | 1598 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia()); |
| 1597 } | 1599 } |
| 1598 | 1600 |
| 1599 void WebIntentPickerViews::RefreshExtensions() { | 1601 void WebIntentPickerViews::RefreshExtensions() { |
| 1600 DCHECK(extensions_); | 1602 DCHECK(extensions_); |
| 1601 extensions_->Update(); | 1603 extensions_->Update(); |
| 1602 contents_->Layout(); | 1604 contents_->Layout(); |
| 1603 SizeToContents(); | 1605 SizeToContents(); |
| 1604 } | 1606 } |
| OLD | NEW |