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

Side by Side Diff: chrome/browser/extensions/api/web_navigation/web_navigation_api.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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) 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 // Implements the Chrome Extensions WebNavigation API. 5 // Implements the Chrome Extensions WebNavigation API.
6 6
7 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 7 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 12 matching lines...) Expand all
23 #include "content/public/browser/render_frame_host.h" 23 #include "content/public/browser/render_frame_host.h"
24 #include "content/public/browser/render_process_host.h" 24 #include "content/public/browser/render_process_host.h"
25 #include "content/public/browser/render_view_host.h" 25 #include "content/public/browser/render_view_host.h"
26 #include "content/public/browser/resource_request_details.h" 26 #include "content/public/browser/resource_request_details.h"
27 #include "content/public/browser/web_contents.h" 27 #include "content/public/browser/web_contents.h"
28 #include "content/public/common/url_constants.h" 28 #include "content/public/common/url_constants.h"
29 #include "extensions/browser/event_router.h" 29 #include "extensions/browser/event_router.h"
30 #include "extensions/browser/view_type_utils.h" 30 #include "extensions/browser/view_type_utils.h"
31 #include "net/base/net_errors.h" 31 #include "net/base/net_errors.h"
32 32
33 using content::ResourceType;
34
33 namespace GetFrame = extensions::api::web_navigation::GetFrame; 35 namespace GetFrame = extensions::api::web_navigation::GetFrame;
34 namespace GetAllFrames = extensions::api::web_navigation::GetAllFrames; 36 namespace GetAllFrames = extensions::api::web_navigation::GetAllFrames;
35 37
36 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::WebNavigationTabObserver); 38 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::WebNavigationTabObserver);
37 39
38 namespace extensions { 40 namespace extensions {
39 41
40 namespace helpers = web_navigation_api_helpers; 42 namespace helpers = web_navigation_api_helpers;
41 namespace keys = web_navigation_api_constants; 43 namespace keys = web_navigation_api_constants;
42 namespace web_navigation = api::web_navigation; 44 namespace web_navigation = api::web_navigation;
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 return g_factory.Pointer(); 843 return g_factory.Pointer();
842 } 844 }
843 845
844 void WebNavigationAPI::OnListenerAdded(const EventListenerInfo& details) { 846 void WebNavigationAPI::OnListenerAdded(const EventListenerInfo& details) {
845 web_navigation_event_router_.reset(new WebNavigationEventRouter( 847 web_navigation_event_router_.reset(new WebNavigationEventRouter(
846 Profile::FromBrowserContext(browser_context_))); 848 Profile::FromBrowserContext(browser_context_)));
847 EventRouter::Get(browser_context_)->UnregisterObserver(this); 849 EventRouter::Get(browser_context_)->UnregisterObserver(this);
848 } 850 }
849 851
850 } // namespace extensions 852 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698