diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 01:18:29 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 01:18:29 +0000 |
| commit | a366880f8475fa9e0e70ace062af10654b297574 (patch) | |
| tree | 5c2a777d77feebefc4b8c0f0c78525d57be93b16 /chrome/browser/tab_contents | |
| parent | c811184533d882af419cab0dabe0bf317c6c985f (diff) | |
| download | chromium_src-a366880f8475fa9e0e70ace062af10654b297574.zip chromium_src-a366880f8475fa9e0e70ace062af10654b297574.tar.gz chromium_src-a366880f8475fa9e0e70ace062af10654b297574.tar.bz2 | |
Remove CrApplication dependency from base
Add a @protocol CrAppProtocol that clients of base must implement in their NSApplication subclass, and let base depend only on this protocol.
Let MessagePumpNSApplication::DoRun() no longer initialize NSApplication (fixes a TODO).
Add a MockCrApplication that the simple unittests in base and app can use, move chrome_application to chrome/common.
Test shell might run nested run loops, so I gave it a real but simplified CrAppProtocol implementation.
BUG=62968,46929
TEST=Everything still works. The PDF plugin prints one fewer warning when loaded.
Review URL: http://codereview.chromium.org/5950003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/popup_menu_helper_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents_view_mac.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/popup_menu_helper_mac.mm b/chrome/browser/tab_contents/popup_menu_helper_mac.mm index df8862c..aea6a7b 100644 --- a/chrome/browser/tab_contents/popup_menu_helper_mac.mm +++ b/chrome/browser/tab_contents/popup_menu_helper_mac.mm @@ -6,12 +6,12 @@ #include "chrome/browser/tab_contents/popup_menu_helper_mac.h" -#import "base/chrome_application_mac.h" #include "base/message_loop.h" #include "base/scoped_nsobject.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" #import "chrome/browser/ui/cocoa/base_view.h" +#import "chrome/common/chrome_application_mac.h" #include "chrome/common/notification_source.h" #include "webkit/glue/webmenurunner_mac.h" diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm index a6b111a..8d810dd 100644 --- a/chrome/browser/tab_contents/tab_contents_view_mac.mm +++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm @@ -8,7 +8,6 @@ #include <string> -#import "base/chrome_application_mac.h" #include "chrome/browser/global_keyboard_shortcuts_mac.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_view_host_factory.h" @@ -24,6 +23,7 @@ #import "chrome/browser/ui/cocoa/web_drag_source.h" #import "chrome/browser/ui/cocoa/web_drop_target.h" #import "chrome/browser/ui/cocoa/view_id_util.h" +#import "chrome/common/chrome_application_mac.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" |