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

Side by Side Diff: chrome/browser/ui/blocked_content/blocked_window_params.cc

Issue 731083002: Update popup blocker behavior and tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 6 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/ui/blocked_content/popup_blocker_browsertest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui/blocked_content/blocked_window_params.h" 5 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
6 6
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "content/public/browser/render_process_host.h" 9 #include "content/public/browser/render_process_host.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 nav_params.window_bounds = web_contents->GetContainerBounds(); 48 nav_params.window_bounds = web_contents->GetContainerBounds();
49 if (features_.xSet) 49 if (features_.xSet)
50 nav_params.window_bounds.set_x(features_.x); 50 nav_params.window_bounds.set_x(features_.x);
51 if (features_.ySet) 51 if (features_.ySet)
52 nav_params.window_bounds.set_y(features_.y); 52 nav_params.window_bounds.set_y(features_.y);
53 if (features_.widthSet) 53 if (features_.widthSet)
54 nav_params.window_bounds.set_width(features_.width); 54 nav_params.window_bounds.set_width(features_.width);
55 if (features_.heightSet) 55 if (features_.heightSet)
56 nav_params.window_bounds.set_height(features_.height); 56 nav_params.window_bounds.set_height(features_.height);
57 57
58 // Compare RenderViewImpl::show(). 58 nav_params.disposition = disposition_;
59 if (!user_gesture_ && disposition_ != NEW_BACKGROUND_TAB)
60 nav_params.disposition = NEW_POPUP;
61 else
62 nav_params.disposition = disposition_;
63 59
64 return nav_params; 60 return nav_params;
65 } 61 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698