summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-18 20:27:52 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-18 20:27:52 +0000
commit59e69e745ba3fa290ff3c50e65c3db03ee9dde6b (patch)
tree64b82fd1e2375845b59f278f2a1e892dcf54377b /chrome/browser
parentbd41e70e44d19eb809eb8565b1d8479daef5d8f5 (diff)
downloadchromium_src-59e69e745ba3fa290ff3c50e65c3db03ee9dde6b.zip
chromium_src-59e69e745ba3fa290ff3c50e65c3db03ee9dde6b.tar.gz
chromium_src-59e69e745ba3fa290ff3c50e65c3db03ee9dde6b.tar.bz2
Move message_pump to base/message_loop.
This also fixes some namespace usage inside the message pump files and updates all users of these files to use the new location. Reland of 206507. Original review https://codereview.chromium.org/17078005/ TBR=sky Review URL: https://codereview.chromium.org/16897006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chrome_browser_application_mac.h2
-rw-r--r--chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/constrained_window/constrained_window_animation_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/run_loop_testing.mm2
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chrome_browser_application_mac.h b/chrome/browser/chrome_browser_application_mac.h
index b696c41..5363942 100644
--- a/chrome/browser/chrome_browser_application_mac.h
+++ b/chrome/browser/chrome_browser_application_mac.h
@@ -13,7 +13,7 @@
#import "base/mac/scoped_sending_event.h"
#import "base/memory/scoped_nsobject.h"
-#import "base/message_pump_mac.h"
+#import "base/message_loop/message_pump_mac.h"
#include "base/synchronization/lock.h"
@interface BrowserCrApplication : NSApplication<CrAppProtocol,
diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
index 45863ed..2f5b3be 100644
--- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
@@ -5,7 +5,7 @@
#import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h"
#include "base/memory/scoped_nsobject.h"
-#include "base/message_pump_mac.h"
+#include "base/message_loop/message_pump_mac.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/profiles/avatar_menu_model.h"
#include "chrome/browser/profiles/avatar_menu_model_observer.h"
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation_unittest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation_unittest.mm
index b8c960d..9c7c2bd 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation_unittest.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation_unittest.mm
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/memory/scoped_nsobject.h"
-#include "base/message_pump_mac.h"
+#include "base/message_loop/message_pump_mac.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm b/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm
index 18e78b7..491bf24 100644
--- a/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm
@@ -7,7 +7,7 @@
#import <QuartzCore/QuartzCore.h>
#include "base/memory/ref_counted.h"
-#include "base/message_pump_mac.h"
+#include "base/message_loop/message_pump_mac.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#import "third_party/ocmock/gtest_support.h"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/chrome/browser/ui/cocoa/run_loop_testing.mm b/chrome/browser/ui/cocoa/run_loop_testing.mm
index d20d3ce..b85722a 100644
--- a/chrome/browser/ui/cocoa/run_loop_testing.mm
+++ b/chrome/browser/ui/cocoa/run_loop_testing.mm
@@ -7,7 +7,7 @@
#import <Foundation/Foundation.h>
#include "base/memory/scoped_nsobject.h"
-#include "base/message_pump_mac.h"
+#include "base/message_loop/message_pump_mac.h"
// This class is scheduled with a delayed selector to quit the message pump.
@interface CocoaQuitTask : NSObject {