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

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

Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: stage changes to preserve history Created 8 years 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 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 } else if (source == choose_another_service_link_) { 1136 } else if (source == choose_another_service_link_) {
1137 // Signal cancellation of inline disposition. 1137 // Signal cancellation of inline disposition.
1138 delegate_->OnChooseAnotherService(); 1138 delegate_->OnChooseAnotherService();
1139 ResetContents(); 1139 ResetContents();
1140 } else { 1140 } else {
1141 NOTREACHED(); 1141 NOTREACHED();
1142 } 1142 }
1143 } 1143 }
1144 1144
1145 void WebIntentPickerViews::Close() { 1145 void WebIntentPickerViews::Close() {
1146 window_->CloseConstrainedWindow(); 1146 window_->CloseWebContentsModalDialog();
1147 } 1147 }
1148 1148
1149 void WebIntentPickerViews::SetActionString(const string16& action) { 1149 void WebIntentPickerViews::SetActionString(const string16& action) {
1150 action_text_ = action; 1150 action_text_ = action;
1151 if (action_label_) { 1151 if (action_label_) {
1152 action_label_->SetText(GetActionTitle()); 1152 action_label_->SetText(GetActionTitle());
1153 contents_->Layout(); 1153 contents_->Layout();
1154 SizeToContents(); 1154 SizeToContents();
1155 } 1155 }
1156 } 1156 }
(...skipping 435 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