| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/extension_host.h" | 5 #include "chrome/browser/extensions/extension_host.h" |
| 6 | 6 |
| 7 #include <list> | 7 #include <list> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 #include "chrome/browser/tab_contents/tab_contents.h" | 37 #include "chrome/browser/tab_contents/tab_contents.h" |
| 38 #include "chrome/browser/tab_contents/tab_contents_view.h" | 38 #include "chrome/browser/tab_contents/tab_contents_view.h" |
| 39 #include "chrome/common/bindings_policy.h" | 39 #include "chrome/common/bindings_policy.h" |
| 40 #include "chrome/common/extensions/extension.h" | 40 #include "chrome/common/extensions/extension.h" |
| 41 #include "chrome/common/extensions/extension_constants.h" | 41 #include "chrome/common/extensions/extension_constants.h" |
| 42 #include "chrome/common/native_web_keyboard_event.h" | 42 #include "chrome/common/native_web_keyboard_event.h" |
| 43 #include "chrome/common/notification_service.h" | 43 #include "chrome/common/notification_service.h" |
| 44 #include "chrome/common/pref_names.h" | 44 #include "chrome/common/pref_names.h" |
| 45 #include "chrome/common/view_types.h" | 45 #include "chrome/common/view_types.h" |
| 46 #include "chrome/common/render_messages.h" | 46 #include "chrome/common/render_messages.h" |
| 47 #include "chrome/common/render_messages_params.h" |
| 47 #include "chrome/common/url_constants.h" | 48 #include "chrome/common/url_constants.h" |
| 48 #include "grit/browser_resources.h" | 49 #include "grit/browser_resources.h" |
| 49 #include "grit/generated_resources.h" | 50 #include "grit/generated_resources.h" |
| 50 #include "webkit/glue/context_menu.h" | 51 #include "webkit/glue/context_menu.h" |
| 51 | 52 |
| 52 #if defined(TOOLKIT_VIEWS) | 53 #if defined(TOOLKIT_VIEWS) |
| 53 #include "views/widget/widget.h" | 54 #include "views/widget/widget.h" |
| 54 #endif | 55 #endif |
| 55 | 56 |
| 56 using WebKit::WebDragOperation; | 57 using WebKit::WebDragOperation; |
| (...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 // Extensions hosted in ExternalTabContainer objects may not have | 691 // Extensions hosted in ExternalTabContainer objects may not have |
| 691 // an associated browser. | 692 // an associated browser. |
| 692 Browser* browser = GetBrowser(); | 693 Browser* browser = GetBrowser(); |
| 693 if (browser) | 694 if (browser) |
| 694 window_id = ExtensionTabUtil::GetWindowId(browser); | 695 window_id = ExtensionTabUtil::GetWindowId(browser); |
| 695 } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) { | 696 } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) { |
| 696 NOTREACHED(); | 697 NOTREACHED(); |
| 697 } | 698 } |
| 698 return window_id; | 699 return window_id; |
| 699 } | 700 } |
| OLD | NEW |