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

Side by Side Diff: chrome/browser/extensions/tab_helper.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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/extensions/tab_helper.h" 5 #include "chrome/browser/extensions/tab_helper.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/browser/extensions/active_script_controller.h" 11 #include "chrome/browser/extensions/active_script_controller.h"
12 #include "chrome/browser/extensions/activity_log/activity_log.h" 12 #include "chrome/browser/extensions/activity_log/activity_log.h"
13 #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules _registry.h" 13 #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules _registry.h"
14 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" 14 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
15 #include "chrome/browser/extensions/api/webstore/webstore_api.h" 15 #include "chrome/browser/extensions/api/webstore/webstore_api.h"
16 #include "chrome/browser/extensions/bookmark_app_helper.h" 16 #include "chrome/browser/extensions/bookmark_app_helper.h"
17 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 17 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
18 #include "chrome/browser/extensions/extension_tab_util.h" 18 #include "chrome/browser/extensions/extension_tab_util.h"
19 #include "chrome/browser/extensions/extension_util.h" 19 #include "chrome/browser/extensions/extension_util.h"
20 #include "chrome/browser/extensions/location_bar_controller.h" 20 #include "chrome/browser/extensions/location_bar_controller.h"
21 #include "chrome/browser/extensions/webstore_inline_installer.h" 21 #include "chrome/browser/extensions/webstore_inline_installer.h"
22 #include "chrome/browser/extensions/webstore_inline_installer_factory.h" 22 #include "chrome/browser/extensions/webstore_inline_installer_factory.h"
23 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/sessions/session_tab_helper.h" 24 #include "chrome/browser/sessions/session_tab_helper.h"
25 #include "chrome/browser/shell_integration.h" 25 #include "chrome/browser/shell_integration.h"
26 #include "chrome/browser/ui/browser_commands.h" 26 #include "chrome/browser/ui/browser_commands.h"
27 #include "chrome/browser/ui/browser_dialogs.h" 27 #include "chrome/browser/ui/browser_dialogs.h"
28 #include "chrome/browser/ui/browser_finder.h" 28 #include "chrome/browser/ui/browser_finder.h"
29 #include "chrome/browser/ui/host_desktop.h"
30 #include "chrome/browser/web_applications/web_app.h" 29 #include "chrome/browser/web_applications/web_app.h"
31 #include "chrome/common/extensions/chrome_extension_messages.h" 30 #include "chrome/common/extensions/chrome_extension_messages.h"
32 #include "chrome/common/extensions/extension_constants.h" 31 #include "chrome/common/extensions/extension_constants.h"
33 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 32 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
34 #include "chrome/common/render_messages.h" 33 #include "chrome/common/render_messages.h"
35 #include "chrome/common/url_constants.h" 34 #include "chrome/common/url_constants.h"
36 #include "content/public/browser/invalidate_type.h" 35 #include "content/public/browser/invalidate_type.h"
37 #include "content/public/browser/navigation_controller.h" 36 #include "content/public/browser/navigation_controller.h"
38 #include "content/public/browser/navigation_details.h" 37 #include "content/public/browser/navigation_details.h"
39 #include "content/public/browser/navigation_entry.h" 38 #include "content/public/browser/navigation_entry.h"
(...skipping 12 matching lines...) Expand all
52 #include "extensions/browser/extension_web_contents_observer.h" 51 #include "extensions/browser/extension_web_contents_observer.h"
53 #include "extensions/browser/image_loader.h" 52 #include "extensions/browser/image_loader.h"
54 #include "extensions/common/constants.h" 53 #include "extensions/common/constants.h"
55 #include "extensions/common/extension.h" 54 #include "extensions/common/extension.h"
56 #include "extensions/common/extension_icon_set.h" 55 #include "extensions/common/extension_icon_set.h"
57 #include "extensions/common/extension_messages.h" 56 #include "extensions/common/extension_messages.h"
58 #include "extensions/common/extension_resource.h" 57 #include "extensions/common/extension_resource.h"
59 #include "extensions/common/extension_urls.h" 58 #include "extensions/common/extension_urls.h"
60 #include "extensions/common/feature_switch.h" 59 #include "extensions/common/feature_switch.h"
61 #include "extensions/common/manifest_handlers/icons_handler.h" 60 #include "extensions/common/manifest_handlers/icons_handler.h"
61 #include "ui/gfx/host_desktop_type.h"
62 62
63 #if defined(OS_WIN) 63 #if defined(OS_WIN)
64 #include "chrome/browser/web_applications/web_app_win.h" 64 #include "chrome/browser/web_applications/web_app_win.h"
65 #endif 65 #endif
66 66
67 using content::NavigationController; 67 using content::NavigationController;
68 using content::NavigationEntry; 68 using content::NavigationEntry;
69 using content::WebContents; 69 using content::WebContents;
70 70
71 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::TabHelper); 71 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::TabHelper);
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 } 566 }
567 } 567 }
568 568
569 void TabHelper::SetTabId(content::RenderFrameHost* render_frame_host) { 569 void TabHelper::SetTabId(content::RenderFrameHost* render_frame_host) {
570 render_frame_host->Send( 570 render_frame_host->Send(
571 new ExtensionMsg_SetTabId(render_frame_host->GetRoutingID(), 571 new ExtensionMsg_SetTabId(render_frame_host->GetRoutingID(),
572 SessionTabHelper::IdForTab(web_contents()))); 572 SessionTabHelper::IdForTab(web_contents())));
573 } 573 }
574 574
575 } // namespace extensions 575 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/launch_util.cc ('k') | chrome/browser/extensions/theme_installed_infobar_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698