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

Side by Side Diff: chrome/browser/background/background_contents_service.h

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 1 month 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 CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_ 5 #ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_
6 #define CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_ 6 #define CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 BackgroundContents* contents) const; 106 BackgroundContents* contents) const;
107 107
108 // Creates a new BackgroundContents using the passed |site| and 108 // Creates a new BackgroundContents using the passed |site| and
109 // the |route_id| and begins tracking the object internally so it can be 109 // the |route_id| and begins tracking the object internally so it can be
110 // shutdown if the parent application is uninstalled. 110 // shutdown if the parent application is uninstalled.
111 // A BACKGROUND_CONTENTS_OPENED notification will be generated with the passed 111 // A BACKGROUND_CONTENTS_OPENED notification will be generated with the passed
112 // |frame_name| and |application_id| values, using the passed |profile| as the 112 // |frame_name| and |application_id| values, using the passed |profile| as the
113 // Source.. 113 // Source..
114 BackgroundContents* CreateBackgroundContents( 114 BackgroundContents* CreateBackgroundContents(
115 content::SiteInstance* site, 115 content::SiteInstance* site,
116 int route_id, 116 int32_t route_id,
117 int main_frame_route_id, 117 int32_t main_frame_route_id,
118 int32_t main_frame_widget_route_id,
118 Profile* profile, 119 Profile* profile,
119 const std::string& frame_name, 120 const std::string& frame_name,
120 const base::string16& application_id, 121 const base::string16& application_id,
121 const std::string& partition_id, 122 const std::string& partition_id,
122 content::SessionStorageNamespace* session_storage_namespace); 123 content::SessionStorageNamespace* session_storage_namespace);
123 124
124 // Load the manifest-specified background page for the specified hosted app. 125 // Load the manifest-specified background page for the specified hosted app.
125 // If the manifest doesn't specify one, then load the BackgroundContents 126 // If the manifest doesn't specify one, then load the BackgroundContents
126 // registered in the pref. This is typically used to reload a crashed 127 // registered in the pref. This is typically used to reload a crashed
127 // background page. 128 // background page.
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 BackgroundContentsMap contents_map_; 237 BackgroundContentsMap contents_map_;
237 238
238 ScopedObserver<extensions::ExtensionRegistry, 239 ScopedObserver<extensions::ExtensionRegistry,
239 extensions::ExtensionRegistryObserver> 240 extensions::ExtensionRegistryObserver>
240 extension_registry_observer_; 241 extension_registry_observer_;
241 242
242 DISALLOW_COPY_AND_ASSIGN(BackgroundContentsService); 243 DISALLOW_COPY_AND_ASSIGN(BackgroundContentsService);
243 }; 244 };
244 245
245 #endif // CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_ 246 #endif // CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698