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

Side by Side Diff: chrome/browser/external_tab_container_win.h

Issue 3036038: ChromeFrame currently overrides the request context for intercepting network ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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
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 #ifndef CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_ 5 #ifndef CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
6 #define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_ 6 #define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 #include <map> 10 #include <map>
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "chrome/browser/automation/automation_resource_message_filter.h" 12 #include "chrome/browser/automation/automation_resource_message_filter.h"
13 #include "chrome/browser/automation/automation_profile_impl.h"
14 #include "chrome/browser/browser.h" 13 #include "chrome/browser/browser.h"
15 #include "chrome/browser/net/chrome_url_request_context.h" 14 #include "chrome/browser/net/chrome_url_request_context.h"
16 #include "chrome/browser/tab_contents/tab_contents_delegate.h" 15 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
17 #include "chrome/browser/views/frame/browser_bubble_host.h" 16 #include "chrome/browser/views/frame/browser_bubble_host.h"
18 #include "chrome/browser/views/infobars/infobar_container.h" 17 #include "chrome/browser/views/infobars/infobar_container.h"
19 #include "chrome/browser/views/unhandled_keyboard_event_handler.h" 18 #include "chrome/browser/views/unhandled_keyboard_event_handler.h"
20 #include "chrome/common/navigation_types.h" 19 #include "chrome/common/navigation_types.h"
21 #include "chrome/common/notification_observer.h" 20 #include "chrome/common/notification_observer.h"
22 #include "chrome/common/notification_registrar.h" 21 #include "chrome/common/notification_registrar.h"
23 #include "views/accelerator.h" 22 #include "views/accelerator.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 // Overridden from views::WidgetWin: 212 // Overridden from views::WidgetWin:
214 virtual LRESULT OnCreate(LPCREATESTRUCT create_struct); 213 virtual LRESULT OnCreate(LPCREATESTRUCT create_struct);
215 virtual void OnDestroy(); 214 virtual void OnDestroy();
216 virtual void OnFinalMessage(HWND window); 215 virtual void OnFinalMessage(HWND window);
217 216
218 bool InitNavigationInfo(IPC::NavigationInfo* nav_info, 217 bool InitNavigationInfo(IPC::NavigationInfo* nav_info,
219 NavigationType::Type nav_type, 218 NavigationType::Type nav_type,
220 int relative_offset); 219 int relative_offset);
221 void Navigate(const GURL& url, const GURL& referrer); 220 void Navigate(const GURL& url, const GURL& referrer);
222 221
223 // Initializes the request context to be used for automation HTTP requests.
224 void InitializeAutomationRequestContext(int tab_handle);
225
226 private: 222 private:
227 friend class base::RefCounted<ExternalTabContainer>; 223 friend class base::RefCounted<ExternalTabContainer>;
228 224
229 ~ExternalTabContainer(); 225 ~ExternalTabContainer();
230 226
231 // Helper resource automation registration method, allowing registration of 227 // Helper resource automation registration method, allowing registration of
232 // pending RenderViewHosts. 228 // pending RenderViewHosts.
233 void RegisterRenderViewHostForAutomation(RenderViewHost* render_view_host, 229 void RegisterRenderViewHostForAutomation(RenderViewHost* render_view_host,
234 bool pending_view); 230 bool pending_view);
235 231
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 327
332 views::View* external_tab_view_; 328 views::View* external_tab_view_;
333 329
334 gfx::NativeWindow notification_window_; 330 gfx::NativeWindow notification_window_;
335 int notification_message_; 331 int notification_message_;
336 332
337 DISALLOW_COPY_AND_ASSIGN(ExternalTabContainer); 333 DISALLOW_COPY_AND_ASSIGN(ExternalTabContainer);
338 }; 334 };
339 335
340 #endif // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_ 336 #endif // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698