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

Side by Side Diff: chrome/browser/extensions/api/tabs/tabs_api.cc

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 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 | 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 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 5 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <vector> 9 #include <vector>
10 10
11 #include "apps/app_window.h"
12 #include "base/bind.h" 11 #include "base/bind.h"
13 #include "base/command_line.h" 12 #include "base/command_line.h"
14 #include "base/logging.h" 13 #include "base/logging.h"
15 #include "base/memory/ref_counted_memory.h" 14 #include "base/memory/ref_counted_memory.h"
16 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
17 #include "base/prefs/pref_service.h" 16 #include "base/prefs/pref_service.h"
18 #include "base/stl_util.h" 17 #include "base/stl_util.h"
19 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
20 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
21 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "components/translate/core/common/language_detection_details.h" 57 #include "components/translate/core/common/language_detection_details.h"
59 #include "content/public/browser/navigation_controller.h" 58 #include "content/public/browser/navigation_controller.h"
60 #include "content/public/browser/navigation_entry.h" 59 #include "content/public/browser/navigation_entry.h"
61 #include "content/public/browser/notification_details.h" 60 #include "content/public/browser/notification_details.h"
62 #include "content/public/browser/notification_source.h" 61 #include "content/public/browser/notification_source.h"
63 #include "content/public/browser/render_process_host.h" 62 #include "content/public/browser/render_process_host.h"
64 #include "content/public/browser/render_view_host.h" 63 #include "content/public/browser/render_view_host.h"
65 #include "content/public/browser/render_widget_host_view.h" 64 #include "content/public/browser/render_widget_host_view.h"
66 #include "content/public/browser/web_contents.h" 65 #include "content/public/browser/web_contents.h"
67 #include "content/public/common/url_constants.h" 66 #include "content/public/common/url_constants.h"
67 #include "extensions/browser/app_window/app_window.h"
68 #include "extensions/browser/extension_function_dispatcher.h" 68 #include "extensions/browser/extension_function_dispatcher.h"
69 #include "extensions/browser/extension_function_util.h" 69 #include "extensions/browser/extension_function_util.h"
70 #include "extensions/browser/extension_host.h" 70 #include "extensions/browser/extension_host.h"
71 #include "extensions/browser/file_reader.h" 71 #include "extensions/browser/file_reader.h"
72 #include "extensions/browser/script_executor.h" 72 #include "extensions/browser/script_executor.h"
73 #include "extensions/common/constants.h" 73 #include "extensions/common/constants.h"
74 #include "extensions/common/error_utils.h" 74 #include "extensions/common/error_utils.h"
75 #include "extensions/common/extension.h" 75 #include "extensions/common/extension.h"
76 #include "extensions/common/extension_messages.h" 76 #include "extensions/common/extension_messages.h"
77 #include "extensions/common/manifest_constants.h" 77 #include "extensions/common/manifest_constants.h"
78 #include "extensions/common/message_bundle.h" 78 #include "extensions/common/message_bundle.h"
79 #include "extensions/common/permissions/permissions_data.h" 79 #include "extensions/common/permissions/permissions_data.h"
80 #include "extensions/common/user_script.h" 80 #include "extensions/common/user_script.h"
81 #include "skia/ext/image_operations.h" 81 #include "skia/ext/image_operations.h"
82 #include "skia/ext/platform_canvas.h" 82 #include "skia/ext/platform_canvas.h"
83 #include "third_party/skia/include/core/SkBitmap.h" 83 #include "third_party/skia/include/core/SkBitmap.h"
84 #include "ui/base/models/list_selection_model.h" 84 #include "ui/base/models/list_selection_model.h"
85 #include "ui/base/ui_base_types.h" 85 #include "ui/base/ui_base_types.h"
86 86
87 #if defined(USE_ASH) 87 #if defined(USE_ASH)
88 #include "apps/app_window_registry.h"
89 #include "ash/ash_switches.h" 88 #include "ash/ash_switches.h"
90 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h" 89 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h"
90 #include "extensions/browser/app_window/app_window_registry.h"
91 #endif 91 #endif
92 92
93 using apps::AppWindow;
94 using content::BrowserThread; 93 using content::BrowserThread;
95 using content::NavigationController; 94 using content::NavigationController;
96 using content::NavigationEntry; 95 using content::NavigationEntry;
97 using content::OpenURLParams; 96 using content::OpenURLParams;
98 using content::Referrer; 97 using content::Referrer;
99 using content::WebContents; 98 using content::WebContents;
100 99
101 namespace extensions { 100 namespace extensions {
102 101
103 namespace windows = api::windows; 102 namespace windows = api::windows;
(...skipping 1792 matching lines...) Expand 10 before | Expand all | Expand 10 after
1896 ZoomController::ZoomMode zoom_mode = zoom_controller->zoom_mode(); 1895 ZoomController::ZoomMode zoom_mode = zoom_controller->zoom_mode();
1897 api::tabs::ZoomSettings zoom_settings; 1896 api::tabs::ZoomSettings zoom_settings;
1898 ZoomModeToZoomSettings(zoom_mode, &zoom_settings); 1897 ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
1899 1898
1900 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings); 1899 results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings);
1901 SendResponse(true); 1900 SendResponse(true);
1902 return true; 1901 return true;
1903 } 1902 }
1904 1903
1905 } // namespace extensions 1904 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tabs/ash_panel_contents.cc ('k') | chrome/browser/extensions/extension_tab_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698