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

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

Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use gtk_widget_get_toplevel for GetNativeWindow Created 7 years, 11 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 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 // Weak pointer to "Waiting for CWS" display. Owned by parent view. 1041 // Weak pointer to "Waiting for CWS" display. Owned by parent view.
1042 WaitingView* waiting_view_; 1042 WaitingView* waiting_view_;
1043 1043
1044 // The text for the current action. 1044 // The text for the current action.
1045 string16 action_text_; 1045 string16 action_text_;
1046 1046
1047 // Ownership of the WebContents we are displaying in the inline disposition. 1047 // Ownership of the WebContents we are displaying in the inline disposition.
1048 scoped_ptr<WebContents> inline_web_contents_; 1048 scoped_ptr<WebContents> inline_web_contents_;
1049 1049
1050 // Indicate if dialog should display its own close button. 1050 // Indicate if dialog should display its own close button.
1051 // TODO(groby): Only relevant until new ConstrainedWindow is implemented, 1051 // TODO(groby): Only relevant until new WebContentsModalDialog is implemented,
1052 // from then on always true. 1052 // from then on always true.
1053 bool use_close_button_; 1053 bool use_close_button_;
1054 1054
1055 // Signals if the picker can be closed. False during extension install. 1055 // Signals if the picker can be closed. False during extension install.
1056 bool can_close_; 1056 bool can_close_;
1057 1057
1058 DISALLOW_COPY_AND_ASSIGN(WebIntentPickerViews); 1058 DISALLOW_COPY_AND_ASSIGN(WebIntentPickerViews);
1059 }; 1059 };
1060 1060
1061 // static 1061 // static
(...skipping 530 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