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

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

Issue 3056003: Attemp 2 at: (Closed)
Patch Set: Fix chromeos breakage Created 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_COCOA_BROWSER_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
7 7
8 #include "base/task.h" 8 #include "base/task.h"
9 #include "chrome/browser/browser_window.h" 9 #include "chrome/browser/browser_window.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 bool show_history); 98 bool show_history);
99 virtual void ShowAppMenu(); 99 virtual void ShowAppMenu();
100 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 100 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
101 bool* is_keyboard_shortcut); 101 bool* is_keyboard_shortcut);
102 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); 102 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
103 virtual void ShowCreateShortcutsDialog(TabContents* tab_contents); 103 virtual void ShowCreateShortcutsDialog(TabContents* tab_contents);
104 virtual void Cut(); 104 virtual void Cut();
105 virtual void Copy(); 105 virtual void Copy();
106 virtual void Paste(); 106 virtual void Paste();
107 virtual void ToggleTabStripMode(); 107 virtual void ToggleTabStripMode();
108 virtual void SetToolbarCollapsedMode(bool val) {};
109 108
110 // Overridden from NotificationObserver 109 // Overridden from NotificationObserver
111 virtual void Observe(NotificationType type, 110 virtual void Observe(NotificationType type,
112 const NotificationSource& source, 111 const NotificationSource& source,
113 const NotificationDetails& details); 112 const NotificationDetails& details);
114 113
115 // Adds the given FindBar cocoa controller to this browser window. 114 // Adds the given FindBar cocoa controller to this browser window.
116 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); 115 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
117 116
118 // Returns the cocoa-world BrowserWindowController 117 // Returns the cocoa-world BrowserWindowController
119 BrowserWindowController* cocoa_controller() { return controller_; } 118 BrowserWindowController* cocoa_controller() { return controller_; }
120 119
121 protected: 120 protected:
122 virtual void DestroyBrowser(); 121 virtual void DestroyBrowser();
123 122
124 private: 123 private:
125 int GetCommandId(const NativeWebKeyboardEvent& event); 124 int GetCommandId(const NativeWebKeyboardEvent& event);
126 bool HandleKeyboardEventInternal(NSEvent* event); 125 bool HandleKeyboardEventInternal(NSEvent* event);
127 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 126 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
128 127
129 NotificationRegistrar registrar_; 128 NotificationRegistrar registrar_;
130 Browser* browser_; // weak, owned by controller 129 Browser* browser_; // weak, owned by controller
131 BrowserWindowController* controller_; // weak, owns us 130 BrowserWindowController* controller_; // weak, owns us
132 ScopedRunnableMethodFactory<Browser> confirm_close_factory_; 131 ScopedRunnableMethodFactory<Browser> confirm_close_factory_;
133 }; 132 };
134 133
135 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ 134 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/frame/browser_view.cc ('k') | chrome/browser/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698