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

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

Issue 10383239: Move NativeWebKeyboardEvent to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 7 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/browser/ui/browser_window.h ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 virtual void ShowPageInfo(Profile* profile, 107 virtual void ShowPageInfo(Profile* profile,
108 const GURL& url, 108 const GURL& url,
109 const content::SSLStatus& ssl, 109 const content::SSLStatus& ssl,
110 bool show_history) OVERRIDE; 110 bool show_history) OVERRIDE;
111 virtual void ShowWebsiteSettings(Profile* profile, 111 virtual void ShowWebsiteSettings(Profile* profile,
112 TabContentsWrapper* tab_contents_wrapper, 112 TabContentsWrapper* tab_contents_wrapper,
113 const GURL& url, 113 const GURL& url,
114 const content::SSLStatus& ssl, 114 const content::SSLStatus& ssl,
115 bool show_history) OVERRIDE; 115 bool show_history) OVERRIDE;
116 virtual void ShowAppMenu() OVERRIDE; 116 virtual void ShowAppMenu() OVERRIDE;
117 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 117 virtual bool PreHandleKeyboardEvent(
118 bool* is_keyboard_shortcut) OVERRIDE; 118 const content::NativeWebKeyboardEvent& event,
119 bool* is_keyboard_shortcut) OVERRIDE;
119 virtual void HandleKeyboardEvent( 120 virtual void HandleKeyboardEvent(
120 const NativeWebKeyboardEvent& event) OVERRIDE; 121 const content::NativeWebKeyboardEvent& event) OVERRIDE;
121 virtual void ShowCreateWebAppShortcutsDialog( 122 virtual void ShowCreateWebAppShortcutsDialog(
122 TabContentsWrapper* tab_contents) OVERRIDE; 123 TabContentsWrapper* tab_contents) OVERRIDE;
123 virtual void ShowCreateChromeAppShortcutsDialog( 124 virtual void ShowCreateChromeAppShortcutsDialog(
124 Profile* profile, 125 Profile* profile,
125 const Extension* app) OVERRIDE; 126 const Extension* app) OVERRIDE;
126 virtual void Cut() OVERRIDE; 127 virtual void Cut() OVERRIDE;
127 virtual void Copy() OVERRIDE; 128 virtual void Copy() OVERRIDE;
128 virtual void Paste() OVERRIDE; 129 virtual void Paste() OVERRIDE;
129 virtual void OpenTabpose() OVERRIDE; 130 virtual void OpenTabpose() OVERRIDE;
130 virtual void EnterPresentationMode( 131 virtual void EnterPresentationMode(
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 PrefChangeRegistrar pref_change_registrar_; 164 PrefChangeRegistrar pref_change_registrar_;
164 Browser* browser_; // weak, owned by controller 165 Browser* browser_; // weak, owned by controller
165 BrowserWindowController* controller_; // weak, owns us 166 BrowserWindowController* controller_; // weak, owns us
166 base::WeakPtrFactory<Browser> confirm_close_factory_; 167 base::WeakPtrFactory<Browser> confirm_close_factory_;
167 scoped_nsobject<NSString> pending_window_title_; 168 scoped_nsobject<NSString> pending_window_title_;
168 ui::WindowShowState initial_show_state_; 169 ui::WindowShowState initial_show_state_;
169 NSInteger attention_request_id_; // identifier from requestUserAttention 170 NSInteger attention_request_id_; // identifier from requestUserAttention
170 }; 171 };
171 172
172 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 173 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698