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

Unified Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

Issue 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error Created 7 years, 5 months 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
Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
similarity index 99%
rename from chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm
rename to chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
index 67611f45199a79ff92c2949ceaaf0be0de9b1848..d2bd221e782ca985f84d95937d5f8a84eb1d8a1c 100644
--- a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h"
+#include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"
#include "base/command_line.h"
#include "base/mac/mac_util.h"
@@ -843,9 +843,3 @@ ShellNSWindow* NativeAppWindowCocoa::window() const {
return static_cast<ShellNSWindow*>(window);
}
tapted 2013/08/01 07:18:59 nit: remove blank line (I think)
benwells 2013/08/01 08:19:39 Done.
-// static
-NativeAppWindow* NativeAppWindow::Create(
- ShellWindow* shell_window,
- const ShellWindow::CreateParams& params) {
- return new NativeAppWindowCocoa(shell_window, params);
-}

Powered by Google App Engine
This is Rietveld 408576698