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

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

Issue 10450002: Transfer user agent override info between browser and renderer (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added logic to instant loader to match prerenderer Created 8 years, 6 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
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 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 WebKit::WebFrame* frame, 637 WebKit::WebFrame* frame,
638 const WebKit::WebIntentServiceInfo& service); 638 const WebKit::WebIntentServiceInfo& service);
639 virtual void dispatchIntent(WebKit::WebFrame* frame, 639 virtual void dispatchIntent(WebKit::WebFrame* frame,
640 const WebKit::WebIntentRequest& intentRequest); 640 const WebKit::WebIntentRequest& intentRequest);
641 virtual void willOpenSocketStream( 641 virtual void willOpenSocketStream(
642 WebKit::WebSocketStreamHandle* handle); 642 WebKit::WebSocketStreamHandle* handle);
643 virtual bool willCheckAndDispatchMessageEvent( 643 virtual bool willCheckAndDispatchMessageEvent(
644 WebKit::WebFrame* source, 644 WebKit::WebFrame* source,
645 WebKit::WebSecurityOrigin targetOrigin, 645 WebKit::WebSecurityOrigin targetOrigin,
646 WebKit::WebDOMMessageEvent event) OVERRIDE; 646 WebKit::WebDOMMessageEvent event) OVERRIDE;
647 virtual WebKit::WebString userAgentOverride(
648 const WebKit::WebURL& url) OVERRIDE;
647 649
648 // WebKit::WebPageSerializerClient implementation ---------------------------- 650 // WebKit::WebPageSerializerClient implementation ----------------------------
649 651
650 virtual void didSerializeDataForFrame( 652 virtual void didSerializeDataForFrame(
651 const WebKit::WebURL& frame_url, 653 const WebKit::WebURL& frame_url,
652 const WebKit::WebCString& data, 654 const WebKit::WebCString& data,
653 PageSerializationStatus status) OVERRIDE; 655 PageSerializationStatus status) OVERRIDE;
654 656
655 // content::RenderView implementation ---------------------------------------- 657 // content::RenderView implementation ----------------------------------------
656 658
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1120 // scroll bars on windows smaller than this size. Used for windows that the 1122 // scroll bars on windows smaller than this size. Used for windows that the
1121 // browser resizes to the size of the content, such as browser action popups. 1123 // browser resizes to the size of the content, such as browser action popups.
1122 // If a render view is set to the minimum size of its content, webkit may add 1124 // If a render view is set to the minimum size of its content, webkit may add
1123 // scroll bars. This makes sense for fixed sized windows, but it does not 1125 // scroll bars. This makes sense for fixed sized windows, but it does not
1124 // make sense when the size of the view was chosen to fit the content. 1126 // make sense when the size of the view was chosen to fit the content.
1125 // This setting ensures that no scroll bars are drawn. The size limit exists 1127 // This setting ensures that no scroll bars are drawn. The size limit exists
1126 // because if the view grows beyond a size known to the browser, scroll bars 1128 // because if the view grows beyond a size known to the browser, scroll bars
1127 // should be drawn. 1129 // should be drawn.
1128 gfx::Size disable_scrollbars_size_limit_; 1130 gfx::Size disable_scrollbars_size_limit_;
1129 1131
1132 // Whether or not the override is being used.
1133 bool is_overriding_user_agent_;
1134
1130 // Loading state ------------------------------------------------------------- 1135 // Loading state -------------------------------------------------------------
1131 1136
1132 // True if the top level frame is currently being loaded. 1137 // True if the top level frame is currently being loaded.
1133 bool is_loading_; 1138 bool is_loading_;
1134 1139
1135 // The gesture that initiated the current navigation. 1140 // The gesture that initiated the current navigation.
1136 NavigationGesture navigation_gesture_; 1141 NavigationGesture navigation_gesture_;
1137 1142
1138 // Used for popups. 1143 // Used for popups.
1139 bool opened_by_user_gesture_; 1144 bool opened_by_user_gesture_;
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 // bunch of stuff, you should probably create a helper class and put your 1436 // bunch of stuff, you should probably create a helper class and put your
1432 // data and methods on that to avoid bloating RenderView more. You can 1437 // data and methods on that to avoid bloating RenderView more. You can
1433 // use the Observer interface to filter IPC messages and receive frame change 1438 // use the Observer interface to filter IPC messages and receive frame change
1434 // notifications. 1439 // notifications.
1435 // --------------------------------------------------------------------------- 1440 // ---------------------------------------------------------------------------
1436 1441
1437 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1442 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1438 }; 1443 };
1439 1444
1440 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1445 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698