summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main_mac.mm
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-31 20:25:18 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-31 20:25:18 +0000
commit4573fbd30d7ed70f959efb69b32ad9547465f0ce (patch)
tree958d424cf2dfa7b22aba942c8ebc383a5ba22517 /chrome/browser/chrome_browser_main_mac.mm
parent5262dc192af688c4f9301753fa7890975303b909 (diff)
downloadchromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.zip
chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.tar.gz
chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.tar.bz2
Move content_restriction.h and main_function_params.h to content/public/common, and put them in the content namespace.
BUG=98716 Review URL: http://codereview.chromium.org/8387039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_mac.mm')
-rw-r--r--chrome/browser/chrome_browser_main_mac.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index 99428ee..02c9d05 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -19,7 +19,7 @@
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
-#include "content/common/main_function_params.h"
+#include "content/public/common/main_function_params.h"
#include "content/public/common/result_codes.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/resource/resource_bundle.h"
@@ -46,7 +46,7 @@ int DoUninstallTasks(bool chrome_still_running) {
// ChromeBrowserMainPartsMac ---------------------------------------------------
ChromeBrowserMainPartsMac::ChromeBrowserMainPartsMac(
- const MainFunctionParams& parameters)
+ const content::MainFunctionParams& parameters)
: ChromeBrowserMainPartsPosix(parameters) {
}