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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 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
« no previous file with comments | « content/renderer/render_frame_proxy.cc ('k') | content/shell/browser/shell.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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 blink::WebStringToGURL(request.httpHeaderField( 301 blink::WebStringToGURL(request.httpHeaderField(
302 WebString::fromUTF8("Referer"))), 302 WebString::fromUTF8("Referer"))),
303 request.referrerPolicy()); 303 request.referrerPolicy());
304 } 304 }
305 305
306 // static 306 // static
307 WindowOpenDisposition RenderViewImpl::NavigationPolicyToDisposition( 307 WindowOpenDisposition RenderViewImpl::NavigationPolicyToDisposition(
308 WebNavigationPolicy policy) { 308 WebNavigationPolicy policy) {
309 switch (policy) { 309 switch (policy) {
310 case blink::WebNavigationPolicyIgnore: 310 case blink::WebNavigationPolicyIgnore:
311 return IGNORE_ACTION; 311 return WindowOpenDisposition::IGNORE_ACTION;
312 case blink::WebNavigationPolicyDownload: 312 case blink::WebNavigationPolicyDownload:
313 return SAVE_TO_DISK; 313 return WindowOpenDisposition::SAVE_TO_DISK;
314 case blink::WebNavigationPolicyCurrentTab: 314 case blink::WebNavigationPolicyCurrentTab:
315 return CURRENT_TAB; 315 return WindowOpenDisposition::CURRENT_TAB;
316 case blink::WebNavigationPolicyNewBackgroundTab: 316 case blink::WebNavigationPolicyNewBackgroundTab:
317 return NEW_BACKGROUND_TAB; 317 return WindowOpenDisposition::NEW_BACKGROUND_TAB;
318 case blink::WebNavigationPolicyNewForegroundTab: 318 case blink::WebNavigationPolicyNewForegroundTab:
319 return NEW_FOREGROUND_TAB; 319 return WindowOpenDisposition::NEW_FOREGROUND_TAB;
320 case blink::WebNavigationPolicyNewWindow: 320 case blink::WebNavigationPolicyNewWindow:
321 return NEW_WINDOW; 321 return WindowOpenDisposition::NEW_WINDOW;
322 case blink::WebNavigationPolicyNewPopup: 322 case blink::WebNavigationPolicyNewPopup:
323 return NEW_POPUP; 323 return WindowOpenDisposition::NEW_POPUP;
324 default: 324 default:
325 NOTREACHED() << "Unexpected WebNavigationPolicy"; 325 NOTREACHED() << "Unexpected WebNavigationPolicy";
326 return IGNORE_ACTION; 326 return WindowOpenDisposition::IGNORE_ACTION;
327 } 327 }
328 } 328 }
329 329
330 // Returns true if the device scale is high enough that losing subpixel 330 // Returns true if the device scale is high enough that losing subpixel
331 // antialiasing won't have a noticeable effect on text quality. 331 // antialiasing won't have a noticeable effect on text quality.
332 static bool DeviceScaleEnsuresTextQuality(float device_scale_factor) { 332 static bool DeviceScaleEnsuresTextQuality(float device_scale_factor) {
333 #if defined(OS_ANDROID) 333 #if defined(OS_ANDROID)
334 // On Android, we never have subpixel antialiasing. 334 // On Android, we never have subpixel antialiasing.
335 return true; 335 return true;
336 #else 336 #else
(...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 view_params.renderer_preferences = renderer_preferences_; 1573 view_params.renderer_preferences = renderer_preferences_;
1574 view_params.web_preferences = webkit_preferences_; 1574 view_params.web_preferences = webkit_preferences_;
1575 view_params.view_id = reply.route_id; 1575 view_params.view_id = reply.route_id;
1576 view_params.main_frame_routing_id = reply.main_frame_route_id; 1576 view_params.main_frame_routing_id = reply.main_frame_route_id;
1577 view_params.main_frame_widget_routing_id = reply.main_frame_widget_route_id; 1577 view_params.main_frame_widget_routing_id = reply.main_frame_widget_route_id;
1578 view_params.session_storage_namespace_id = 1578 view_params.session_storage_namespace_id =
1579 reply.cloned_session_storage_namespace_id; 1579 reply.cloned_session_storage_namespace_id;
1580 view_params.swapped_out = false; 1580 view_params.swapped_out = false;
1581 // WebCore will take care of setting the correct name. 1581 // WebCore will take care of setting the correct name.
1582 view_params.replicated_frame_state = FrameReplicationState(); 1582 view_params.replicated_frame_state = FrameReplicationState();
1583 view_params.hidden = (params.disposition == NEW_BACKGROUND_TAB); 1583 view_params.hidden =
1584 (params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB);
1584 view_params.never_visible = never_visible; 1585 view_params.never_visible = never_visible;
1585 view_params.next_page_id = 1; 1586 view_params.next_page_id = 1;
1586 view_params.initial_size = initial_size; 1587 view_params.initial_size = initial_size;
1587 view_params.enable_auto_resize = false; 1588 view_params.enable_auto_resize = false;
1588 view_params.min_size = gfx::Size(); 1589 view_params.min_size = gfx::Size();
1589 view_params.max_size = gfx::Size(); 1590 view_params.max_size = gfx::Size();
1590 view_params.page_zoom_level = page_zoom_level_; 1591 view_params.page_zoom_level = page_zoom_level_;
1591 1592
1592 RenderViewImpl* view = 1593 RenderViewImpl* view =
1593 RenderViewImpl::Create(compositor_deps_, view_params, true); 1594 RenderViewImpl::Create(compositor_deps_, view_params, true);
(...skipping 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after
3049 return render_frame->focused_pepper_plugin(); 3050 return render_frame->focused_pepper_plugin();
3050 } 3051 }
3051 frame = frame->traverseNext(false); 3052 frame = frame->traverseNext(false);
3052 } 3053 }
3053 3054
3054 return nullptr; 3055 return nullptr;
3055 } 3056 }
3056 #endif 3057 #endif
3057 3058
3058 } // namespace content 3059 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_proxy.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698