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

Unified Diff: content/gpu/gpu_main.cc

Issue 8771028: [Mac] Remove content/ CrApplication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk for commit-queue. Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_common.gypi ('k') | content/plugin/plugin_main_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 48ff837f17d0554e27209f941909b39793ccf82d..8ecc3f72a636106572ac69f56ef1913a72a753d8 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -22,9 +22,7 @@
#include "ui/gfx/gl/gl_surface.h"
#include "ui/gfx/gl/gl_switches.h"
-#if defined(OS_MACOSX)
-#include "content/common/chrome_application_mac.h"
-#elif defined(OS_WIN)
+#if defined(OS_WIN)
#include "sandbox/src/sandbox.h"
#endif
@@ -85,10 +83,6 @@ int GpuMain(const content::MainFunctionParams& parameters) {
target_services->LowerToken();
#endif
-#if defined(OS_MACOSX)
- chrome_application_mac::RegisterCrApp();
-#endif
-
MessageLoop::Type message_loop_type = MessageLoop::TYPE_UI;
#if defined(OS_WIN)
// Unless we're running on desktop GL, we don't need a UI message
« no previous file with comments | « content/content_common.gypi ('k') | content/plugin/plugin_main_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698