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

Side by Side Diff: content/browser/tab_contents/tab_contents.h

Issue 7661029: Fix handling of tab contents disappearing out from underneath Javascript dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: check delegate too Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 816
817 // See getter above. 817 // See getter above.
818 bool is_being_destroyed_; 818 bool is_being_destroyed_;
819 819
820 // Indicates whether we should notify about disconnection of this 820 // Indicates whether we should notify about disconnection of this
821 // TabContents. This is used to ensure disconnection notifications only 821 // TabContents. This is used to ensure disconnection notifications only
822 // happen if a connection notification has happened and that they happen only 822 // happen if a connection notification has happened and that they happen only
823 // once. 823 // once.
824 bool notify_disconnection_; 824 bool notify_disconnection_;
825 825
826 // Pointer to the JavaScript dialog creator, lazily assigned. Used because the
827 // delegate of this TabContents is nulled before its destructor is called.
828 content::JavaScriptDialogCreator* dialog_creator_;
829
826 #if defined(OS_WIN) 830 #if defined(OS_WIN)
827 // Handle to an event that's set when the page is showing a message box (or 831 // Handle to an event that's set when the page is showing a message box (or
828 // equivalent constrained window). Plugin processes check this to know if 832 // equivalent constrained window). Plugin processes check this to know if
829 // they should pump messages then. 833 // they should pump messages then.
830 base::win::ScopedHandle message_box_active_; 834 base::win::ScopedHandle message_box_active_;
831 #endif 835 #endif
832 836
833 // Set to true when there is an active "before unload" dialog. When true, 837 // Set to true when there is an active "before unload" dialog. When true,
834 // we've forced the throbber to start in Navigate, and we need to remember to 838 // we've forced the throbber to start in Navigate, and we need to remember to
835 // turn it off in OnJavaScriptMessageBoxClosed if the navigation is canceled. 839 // turn it off in OnJavaScriptMessageBoxClosed if the navigation is canceled.
(...skipping 30 matching lines...) Expand all
866 ObserverList<TabContentsObserver> observers_; 870 ObserverList<TabContentsObserver> observers_;
867 871
868 // Content restrictions, used to disable print/copy etc based on content's 872 // Content restrictions, used to disable print/copy etc based on content's
869 // (full-page plugins for now only) permissions. 873 // (full-page plugins for now only) permissions.
870 int content_restrictions_; 874 int content_restrictions_;
871 875
872 DISALLOW_COPY_AND_ASSIGN(TabContents); 876 DISALLOW_COPY_AND_ASSIGN(TabContents);
873 }; 877 };
874 878
875 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 879 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/message_box_handler.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698