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

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

Issue 11889004: Fix a bug where the HTML content in a v2 app window wouldn't be initially focused. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/extensions/native_app_window_cocoa.h
diff --git a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
index 56fb4596ee56187d162611d24d50e991420fbd38..7b322a6a765c1c0c1d72ebcf316abc94acc086f4 100644
--- a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
@@ -14,6 +14,8 @@
#include "chrome/browser/ui/extensions/native_app_window.h"
#include "chrome/browser/ui/extensions/shell_window.h"
#include "chrome/common/extensions/draggable_region.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
#include "ui/gfx/rect.h"
class ExtensionKeybindingRegistryCocoa;
@@ -40,7 +42,8 @@ class SkRegion;
@end
// Cocoa bridge to AppWindow.
-class NativeAppWindowCocoa : public NativeAppWindow {
+class NativeAppWindowCocoa : public NativeAppWindow,
+ public content::NotificationObserver {
public:
NativeAppWindowCocoa(ShellWindow* shell_window,
const ShellWindow::CreateParams& params);
@@ -133,6 +136,11 @@ class NativeAppWindowCocoa : public NativeAppWindow {
void UpdateDraggableRegionsForCustomDrag(
const std::vector<extensions::DraggableRegion>& regions);
+ // Overridden from content::NotificationObserver:
+ virtual void Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE;
+
ShellWindow* shell_window_; // weak - ShellWindow owns NativeAppWindow.
bool has_frame_;
@@ -166,6 +174,8 @@ class NativeAppWindowCocoa : public NativeAppWindow {
// handle.
scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
+ content::NotificationRegistrar registrar_;
+
DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoa);
};

Powered by Google App Engine
This is Rietveld 408576698