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

Side by Side Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 5917001: Change the "Disable outdated plug-ins" lab to block them instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: string change Created 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 IDR_INFOBAR_PLUGIN_INSTALL); 281 IDR_INFOBAR_PLUGIN_INSTALL);
282 } 282 }
283 283
284 virtual bool Accept() { 284 virtual bool Accept() {
285 tab_contents_->OpenURL(update_url_, GURL(), 285 tab_contents_->OpenURL(update_url_, GURL(),
286 NEW_FOREGROUND_TAB, PageTransition::LINK); 286 NEW_FOREGROUND_TAB, PageTransition::LINK);
287 return false; 287 return false;
288 } 288 }
289 289
290 virtual bool Cancel() { 290 virtual bool Cancel() {
291 tab_contents_->OpenURL(GURL(chrome::kChromeUIPluginsURL), GURL(), 291 tab_contents_->render_view_host()->LoadBlockedPlugins();
292 NEW_FOREGROUND_TAB, PageTransition::LINK); 292 return true;
293 return false;
294 } 293 }
295 294
296 virtual bool LinkClicked(WindowOpenDisposition disposition) { 295 virtual bool LinkClicked(WindowOpenDisposition disposition) {
297 // TODO(bauerb): Navigate to a help page explaining why we disabled 296 // TODO(bauerb): Navigate to a help page explaining why we disabled
298 // the plugin, once we have one. 297 // the plugin, once we have one.
299 return false; 298 return false;
300 } 299 }
301 300
302 private: 301 private:
303 TabContents* tab_contents_; 302 TabContents* tab_contents_;
(...skipping 2997 matching lines...) Expand 10 before | Expand all | Expand 10 after
3301 } 3300 }
3302 3301
3303 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) { 3302 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) {
3304 render_manager_.SwapInRenderViewHost(rvh); 3303 render_manager_.SwapInRenderViewHost(rvh);
3305 } 3304 }
3306 3305
3307 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { 3306 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
3308 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh); 3307 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
3309 rwh_view->SetSize(view()->GetContainerSize()); 3308 rwh_view->SetSize(view()->GetContainerSize());
3310 } 3309 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698