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

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

Issue 8366034: Adds browser-side component of Java Bridge for a TabContents (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed another bugus assert Created 9 years, 2 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>
11 #include <string> 11 #include <string>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "base/string16.h" 17 #include "base/string16.h"
18 #include "content/browser/download/save_package.h" 18 #include "content/browser/download/save_package.h"
19 #include "content/browser/javascript_dialogs.h" 19 #include "content/browser/javascript_dialogs.h"
20 #include "content/browser/renderer_host/java_bridge_dispatcher_host_manager.h"
20 #include "content/browser/renderer_host/render_view_host_delegate.h" 21 #include "content/browser/renderer_host/render_view_host_delegate.h"
21 #include "content/browser/tab_contents/navigation_controller.h" 22 #include "content/browser/tab_contents/navigation_controller.h"
22 #include "content/browser/tab_contents/navigation_entry.h" 23 #include "content/browser/tab_contents/navigation_entry.h"
23 #include "content/browser/tab_contents/page_navigator.h" 24 #include "content/browser/tab_contents/page_navigator.h"
24 #include "content/browser/tab_contents/render_view_host_manager.h" 25 #include "content/browser/tab_contents/render_view_host_manager.h"
25 #include "content/browser/tab_contents/tab_contents_observer.h" 26 #include "content/browser/tab_contents/tab_contents_observer.h"
26 #include "content/browser/webui/web_ui.h" 27 #include "content/browser/webui/web_ui.h"
27 #include "content/common/content_export.h" 28 #include "content/common/content_export.h"
28 #include "content/common/property_bag.h" 29 #include "content/common/property_bag.h"
29 #include "content/common/renderer_preferences.h" 30 #include "content/common/renderer_preferences.h"
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 NavigationController controller_; 740 NavigationController controller_;
740 741
741 // The corresponding view. 742 // The corresponding view.
742 scoped_ptr<TabContentsView> view_; 743 scoped_ptr<TabContentsView> view_;
743 744
744 // Helper classes ------------------------------------------------------------ 745 // Helper classes ------------------------------------------------------------
745 746
746 // Manages creation and swapping of render views. 747 // Manages creation and swapping of render views.
747 RenderViewHostManager render_manager_; 748 RenderViewHostManager render_manager_;
748 749
750 // Manages injecting Java objects into all RVHs associated with this TC.
751 // TODO: It would be good if this was instantiated lazilly. But we need it to
752 // track all new RVHs, so that when the first object is injected, it can add
753 // it to them all. Fixing this would be tricky, and the class is fairly
754 // lightweight anyway.
755 scoped_ptr<JavaBridgeDispatcherHostManager>
756 java_bridge_dispatcher_host_manager_;
757
749 // SavePackage, lazily created. 758 // SavePackage, lazily created.
750 scoped_refptr<SavePackage> save_package_; 759 scoped_refptr<SavePackage> save_package_;
751 760
752 // Data for loading state ---------------------------------------------------- 761 // Data for loading state ----------------------------------------------------
753 762
754 // Indicates whether we're currently loading a resource. 763 // Indicates whether we're currently loading a resource.
755 bool is_loading_; 764 bool is_loading_;
756 765
757 // Indicates if the tab is considered crashed. 766 // Indicates if the tab is considered crashed.
758 base::TerminationStatus crashed_status_; 767 base::TerminationStatus crashed_status_;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 ObserverList<TabContentsObserver> observers_; 863 ObserverList<TabContentsObserver> observers_;
855 864
856 // Content restrictions, used to disable print/copy etc based on content's 865 // Content restrictions, used to disable print/copy etc based on content's
857 // (full-page plugins for now only) permissions. 866 // (full-page plugins for now only) permissions.
858 int content_restrictions_; 867 int content_restrictions_;
859 868
860 DISALLOW_COPY_AND_ASSIGN(TabContents); 869 DISALLOW_COPY_AND_ASSIGN(TabContents);
861 }; 870 };
862 871
863 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 872 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698