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

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

Issue 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to after mac app shim fix Created 7 years, 4 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.h
diff --git a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
similarity index 95%
rename from chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
rename to chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
index 1eefbfbd5929c4be145b26c2741fdc791eec006b..27f493c5f6d4c6ecb6d92c62cb3b5813f0dd8d2e 100644
--- a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_NATIVE_APP_WINDOW_COCOA_H_
-#define CHROME_BROWSER_UI_COCOA_EXTENSIONS_NATIVE_APP_WINDOW_COCOA_H_
+#ifndef CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_
+#define CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_
#import <Cocoa/Cocoa.h>
#include <vector>
+#include "apps/native_app_window.h"
#include "apps/shell_window.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/browser_command_executor.h"
-#include "chrome/browser/ui/extensions/native_app_window.h"
#include "content/public/browser/notification_registrar.h"
#include "extensions/common/draggable_region.h"
#include "ui/gfx/rect.h"
@@ -41,7 +41,7 @@ class SkRegion;
@end
// Cocoa bridge to AppWindow.
-class NativeAppWindowCocoa : public NativeAppWindow {
+class NativeAppWindowCocoa : public apps::NativeAppWindow {
public:
NativeAppWindowCocoa(apps::ShellWindow* shell_window,
const apps::ShellWindow::CreateParams& params);
@@ -191,4 +191,4 @@ class NativeAppWindowCocoa : public NativeAppWindow {
DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoa);
};
-#endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_NATIVE_APP_WINDOW_COCOA_H_
+#endif // CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_

Powered by Google App Engine
This is Rietveld 408576698