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

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

Issue 11896047: Move the methods in disposition_utils.h and event_disposition.h to ui\base\window_open_disposition.… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix regex in ui.gyp 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
« no previous file with comments | « chrome/browser/ui/views/toolbar_view.cc ('k') | chrome/browser/ui/webui/generic_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 void IntentRowView::ButtonPressed(views::Button* sender, 717 void IntentRowView::ButtonPressed(views::Button* sender,
718 const ui::Event& event) { 718 const ui::Event& event) {
719 if (type_ == ACTION_INSTALL) 719 if (type_ == ACTION_INSTALL)
720 delegate_->OnExtensionInstallClicked(extension_id_); 720 delegate_->OnExtensionInstallClicked(extension_id_);
721 else 721 else
722 delegate_->OnActionButtonClicked(type_, tag_); 722 delegate_->OnActionButtonClicked(type_, tag_);
723 } 723 }
724 724
725 void IntentRowView::LinkClicked(views::Link* source, 725 void IntentRowView::LinkClicked(views::Link* source,
726 int event_flags) { 726 int event_flags) {
727 delegate_->OnExtensionLinkClicked(extension_id_, 727 delegate_->OnExtensionLinkClicked(
728 chrome::DispositionFromEventFlags(event_flags)); 728 extension_id_, ui::DispositionFromEventFlags(event_flags));
729 } 729 }
730 730
731 void IntentRowView::MarkBusy(const std::string& extension_id) { 731 void IntentRowView::MarkBusy(const std::string& extension_id) {
732 SetEnabled(false); 732 SetEnabled(false);
733 if (extension_id == extension_id_) 733 if (extension_id == extension_id_)
734 StartThrobber(); 734 StartThrobber();
735 } 735 }
736 736
737 void IntentRowView::StartThrobber() { 737 void IntentRowView::StartThrobber() {
738 install_button_->StartThrobber(); 738 install_button_->StartThrobber();
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 } 1125 }
1126 1126
1127 views::View* WebIntentPickerViews::GetContentsView() { 1127 views::View* WebIntentPickerViews::GetContentsView() {
1128 return contents_; 1128 return contents_;
1129 } 1129 }
1130 1130
1131 void WebIntentPickerViews::LinkClicked(views::Link* source, int event_flags) { 1131 void WebIntentPickerViews::LinkClicked(views::Link* source, int event_flags) {
1132 DCHECK(delegate_); 1132 DCHECK(delegate_);
1133 if (source == more_suggestions_link_) { 1133 if (source == more_suggestions_link_) {
1134 delegate_->OnSuggestionsLinkClicked( 1134 delegate_->OnSuggestionsLinkClicked(
1135 chrome::DispositionFromEventFlags(event_flags)); 1135 ui::DispositionFromEventFlags(event_flags));
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() {
(...skipping 446 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
« no previous file with comments | « chrome/browser/ui/views/toolbar_view.cc ('k') | chrome/browser/ui/webui/generic_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698