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

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

Issue 13971005: Basic multi-module support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add browser test Created 7 years, 7 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
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 #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/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/extension_system.h" 9 #include "chrome/browser/extensions/extension_system.h"
10 #include "chrome/browser/net/predictor.h" 10 #include "chrome/browser/net/predictor.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // This is important for classifying the Extension's JavaScript context 120 // This is important for classifying the Extension's JavaScript context
121 // correctly (see ExtensionDispatcher::ClassifyJavaScriptContext). 121 // correctly (see ExtensionDispatcher::ClassifyJavaScriptContext).
122 Send(new ExtensionMsg_Loaded( 122 Send(new ExtensionMsg_Loaded(
123 std::vector<ExtensionMsg_Loaded_Params>( 123 std::vector<ExtensionMsg_Loaded_Params>(
124 1, ExtensionMsg_Loaded_Params(extension)))); 124 1, ExtensionMsg_Loaded_Params(extension))));
125 Send(new ExtensionMsg_ActivateExtension(extension->id())); 125 Send(new ExtensionMsg_ActivateExtension(extension->id()));
126 break; 126 break;
127 127
128 case Manifest::TYPE_UNKNOWN: 128 case Manifest::TYPE_UNKNOWN:
129 case Manifest::TYPE_THEME: 129 case Manifest::TYPE_THEME:
130 case Manifest::TYPE_SHARED_MODULE:
130 break; 131 break;
131 } 132 }
132 } 133 }
133 134
134 const Extension* ChromeRenderViewHostObserver::GetExtension() { 135 const Extension* ChromeRenderViewHostObserver::GetExtension() {
135 // Note that due to ChromeContentBrowserClient::GetEffectiveURL(), hosted apps 136 // Note that due to ChromeContentBrowserClient::GetEffectiveURL(), hosted apps
136 // (excluding bookmark apps) will have a chrome-extension:// URL for their 137 // (excluding bookmark apps) will have a chrome-extension:// URL for their
137 // site, so we can ignore that wrinkle here. 138 // site, so we can ignore that wrinkle here.
138 SiteInstance* site_instance = render_view_host()->GetSiteInstance(); 139 SiteInstance* site_instance = render_view_host()->GetSiteInstance();
139 const GURL& site = site_instance->GetSiteURL(); 140 const GURL& site = site_instance->GetSiteURL();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 content::NotificationService::current()->Notify( 175 content::NotificationService::current()->Notify(
175 chrome::NOTIFICATION_FOCUSED_NODE_TOUCHED, 176 chrome::NOTIFICATION_FOCUSED_NODE_TOUCHED,
176 content::Source<RenderViewHost>(render_view_host()), 177 content::Source<RenderViewHost>(render_view_host()),
177 content::Details<bool>(&editable)); 178 content::Details<bool>(&editable));
178 } else { 179 } else {
179 #if defined(OS_WIN) 180 #if defined(OS_WIN)
180 base::win::DismissVirtualKeyboard(); 181 base::win::DismissVirtualKeyboard();
181 #endif 182 #endif
182 } 183 }
183 } 184 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698