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

Side by Side Diff: chrome_frame/chrome_active_document.h

Issue 6284002: Fix a ChromeFrame Back Forward navigation issue which occurs when we modify t... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « no previous file | chrome_frame/chrome_active_document.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) 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_FRAME_CHROME_ACTIVE_DOCUMENT_H_ 5 #ifndef CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
6 #define CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_ 6 #define CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 #include <atlctl.h> 10 #include <atlctl.h>
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 protected: 362 protected:
363 // ChromeFrameActivexBase overrides 363 // ChromeFrameActivexBase overrides
364 virtual void OnOpenURL( 364 virtual void OnOpenURL(
365 const GURL& url_to_open, const GURL& referrer, int open_disposition); 365 const GURL& url_to_open, const GURL& referrer, int open_disposition);
366 virtual void OnAttachExternalTab(const AttachExternalTabParams& params); 366 virtual void OnAttachExternalTab(const AttachExternalTabParams& params);
367 virtual void OnGoToHistoryEntryOffset(int offset); 367 virtual void OnGoToHistoryEntryOffset(int offset);
368 368
369 // A helper method that updates our internal navigation state 369 // A helper method that updates our internal navigation state
370 // as well as IE's navigation state (viz Title and current URL). 370 // as well as IE's navigation state (viz Title and current URL).
371 // The navigation_flags is a TabContents::InvalidateTypes enum 371 // The navigation_flags is a TabContents::InvalidateTypes enum
372 void UpdateNavigationState(const NavigationInfo& nav_info); 372 void UpdateNavigationState(const NavigationInfo& nav_info, int flags);
373 373
374 TabProxy* GetTabProxy() const { 374 TabProxy* GetTabProxy() const {
375 if (automation_client_.get()) 375 if (automation_client_.get())
376 return automation_client_->tab(); 376 return automation_client_->tab();
377 return NULL; 377 return NULL;
378 } 378 }
379 379
380 // Exec command handlers 380 // Exec command handlers
381 void OnFindInPage(); 381 void OnFindInPage();
382 void OnViewSource(); 382 void OnViewSource();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 BOOL& handled); 435 BOOL& handled);
436 LRESULT OnSetFocus(UINT message, WPARAM wparam, LPARAM lparam, 436 LRESULT OnSetFocus(UINT message, WPARAM wparam, LPARAM lparam,
437 BOOL& handled); 437 BOOL& handled);
438 438
439 // Sets the dimensions on the IE window. These dimensions are parsed out from 439 // Sets the dimensions on the IE window. These dimensions are parsed out from
440 // the information passed in from Chrome during window.open. 440 // the information passed in from Chrome during window.open.
441 void SetWindowDimensions(); 441 void SetWindowDimensions();
442 442
443 // Returns true if the NavigationInfo object passed in represents a new 443 // Returns true if the NavigationInfo object passed in represents a new
444 // navigation initiated by the renderer. 444 // navigation initiated by the renderer.
445 bool IsNewNavigation(const NavigationInfo& new_navigation_info) const; 445 bool IsNewNavigation(const NavigationInfo& new_navigation_info,
446 int flags) const;
446 447
447 protected: 448 protected:
448 typedef std::map<int, OLECMDF> CommandStatusMap; 449 typedef std::map<int, OLECMDF> CommandStatusMap;
449 450
450 NavigationInfo navigation_info_; 451 NavigationInfo navigation_info_;
451 bool is_doc_object_; 452 bool is_doc_object_;
452 453
453 // This indicates whether this is the first navigation in this 454 // This indicates whether this is the first navigation in this
454 // active document. It is initalize to true and it is set to false 455 // active document. It is initalize to true and it is set to false
455 // after we get a navigation notification from Chrome 456 // after we get a navigation notification from Chrome
(...skipping 24 matching lines...) Expand all
480 UrlmonUrlRequestManager::PrivacyInfo::PrivacyRecords::iterator 481 UrlmonUrlRequestManager::PrivacyInfo::PrivacyRecords::iterator
481 next_privacy_record_; 482 next_privacy_record_;
482 483
483 // Dimensions of the window. Used only when opening popups. 484 // Dimensions of the window. Used only when opening popups.
484 gfx::Rect dimensions_; 485 gfx::Rect dimensions_;
485 public: 486 public:
486 OLEINPLACEFRAMEINFO frame_info_; 487 OLEINPLACEFRAMEINFO frame_info_;
487 }; 488 };
488 489
489 #endif // CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_ 490 #endif // CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome_frame/chrome_active_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698