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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.h

Issue 7747011: Revert 98112 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/nibs/Panel.xib ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_nsobject.h" 9 #include "base/memory/scoped_nsobject.h"
10 #include "base/task.h" 10 #include "base/task.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // Adds the given FindBar cocoa controller to this browser window. 125 // Adds the given FindBar cocoa controller to this browser window.
126 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); 126 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
127 127
128 // Returns the cocoa-world BrowserWindowController 128 // Returns the cocoa-world BrowserWindowController
129 BrowserWindowController* cocoa_controller() { return controller_; } 129 BrowserWindowController* cocoa_controller() { return controller_; }
130 130
131 protected: 131 protected:
132 virtual void DestroyBrowser(); 132 virtual void DestroyBrowser();
133 133
134 private: 134 private:
135 int GetCommandId(const NativeWebKeyboardEvent& event);
136 bool HandleKeyboardEventInternal(NSEvent* event);
135 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 137 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
136 void UpdateSidebarForContents(TabContents* tab_contents); 138 void UpdateSidebarForContents(TabContents* tab_contents);
137 139
138 NotificationRegistrar registrar_; 140 NotificationRegistrar registrar_;
139 Browser* browser_; // weak, owned by controller 141 Browser* browser_; // weak, owned by controller
140 BrowserWindowController* controller_; // weak, owns us 142 BrowserWindowController* controller_; // weak, owns us
141 ScopedRunnableMethodFactory<Browser> confirm_close_factory_; 143 ScopedRunnableMethodFactory<Browser> confirm_close_factory_;
142 scoped_nsobject<NSString> pending_window_title_; 144 scoped_nsobject<NSString> pending_window_title_;
143 }; 145 };
144 146
145 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 147 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/app/nibs/Panel.xib ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698