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

Side by Side Diff: chrome/browser/renderer_host/chrome_render_view_host_observer.cc

Issue 8585016: Don't use process isolation for bookmark apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflict. Created 9 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 | 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 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" 5 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/dom_operation_notification_details.h" 8 #include "chrome/browser/dom_operation_notification_details.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/net/predictor.h" 10 #include "chrome/browser/net/predictor.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 if (type == Extension::TYPE_EXTENSION || 126 if (type == Extension::TYPE_EXTENSION ||
127 type == Extension::TYPE_USER_SCRIPT || 127 type == Extension::TYPE_USER_SCRIPT ||
128 type == Extension::TYPE_PACKAGED_APP || 128 type == Extension::TYPE_PACKAGED_APP ||
129 (type == Extension::TYPE_HOSTED_APP && 129 (type == Extension::TYPE_HOSTED_APP &&
130 extension->location() == Extension::COMPONENT)) { 130 extension->location() == Extension::COMPONENT)) {
131 Send(new ExtensionMsg_ActivateExtension(extension->id())); 131 Send(new ExtensionMsg_ActivateExtension(extension->id()));
132 } 132 }
133 } 133 }
134 134
135 const Extension* ChromeRenderViewHostObserver::GetExtension() { 135 const Extension* ChromeRenderViewHostObserver::GetExtension() {
136 // Note that due to ChromeContentBrowserClient::GetEffectiveURL(), even hosted 136 // Note that due to ChromeContentBrowserClient::GetEffectiveURL(), hosted apps
137 // apps will have a chrome-extension:// URL for their site, so we can ignore 137 // (excluding bookmark apps) will have a chrome-extension:// URL for their
138 // that wrinkle here. 138 // site, so we can ignore that wrinkle here.
139 SiteInstance* site_instance = render_view_host()->site_instance(); 139 SiteInstance* site_instance = render_view_host()->site_instance();
140 const GURL& site = site_instance->site(); 140 const GURL& site = site_instance->site();
141 141
142 if (!site.SchemeIs(chrome::kExtensionScheme)) 142 if (!site.SchemeIs(chrome::kExtensionScheme))
143 return NULL; 143 return NULL;
144 144
145 ExtensionService* service = profile_->GetExtensionService(); 145 ExtensionService* service = profile_->GetExtensionService();
146 if (!service) 146 if (!service)
147 return NULL; 147 return NULL;
148 148
(...skipping 25 matching lines...) Expand all
174 content::Source<RenderViewHost>(render_view_host()), 174 content::Source<RenderViewHost>(render_view_host()),
175 content::Details<DomOperationNotificationDetails>(&details)); 175 content::Details<DomOperationNotificationDetails>(&details));
176 } 176 }
177 177
178 void ChromeRenderViewHostObserver::OnFocusedEditableNodeTouched() { 178 void ChromeRenderViewHostObserver::OnFocusedEditableNodeTouched() {
179 content::NotificationService::current()->Notify( 179 content::NotificationService::current()->Notify(
180 chrome::NOTIFICATION_FOCUSED_EDITABLE_NODE_TOUCHED, 180 chrome::NOTIFICATION_FOCUSED_EDITABLE_NODE_TOUCHED,
181 content::Source<RenderViewHost>(render_view_host()), 181 content::Source<RenderViewHost>(render_view_host()),
182 content::NotificationService::NoDetails()); 182 content::NotificationService::NoDetails());
183 } 183 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/renderer/chrome_content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698