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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 697223003: MacViews: Get chrome/browser/ui/views/frame to compile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@constrained
Patch Set: Fix chromeos build Created 6 years, 1 month 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) 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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 const GURL& url, 342 const GURL& url,
343 const content::SSLStatus& ssl) override; 343 const content::SSLStatus& ssl) override;
344 void ShowAppMenu() override; 344 void ShowAppMenu() override;
345 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event, 345 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event,
346 bool* is_keyboard_shortcut) override; 346 bool* is_keyboard_shortcut) override;
347 void HandleKeyboardEvent( 347 void HandleKeyboardEvent(
348 const content::NativeWebKeyboardEvent& event) override; 348 const content::NativeWebKeyboardEvent& event) override;
349 void Cut() override; 349 void Cut() override;
350 void Copy() override; 350 void Copy() override;
351 void Paste() override; 351 void Paste() override;
352
tapted 2014/11/05 05:00:47 nit: can remove this line to avoid a delta in this
Andre 2014/11/05 20:55:23 Done.
352 WindowOpenDisposition GetDispositionForPopupBounds( 353 WindowOpenDisposition GetDispositionForPopupBounds(
353 const gfx::Rect& bounds) override; 354 const gfx::Rect& bounds) override;
354 FindBar* CreateFindBar() override; 355 FindBar* CreateFindBar() override;
355 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() 356 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
356 override; 357 override;
357 void ShowAvatarBubble(content::WebContents* web_contents, 358 void ShowAvatarBubble(content::WebContents* web_contents,
358 const gfx::Rect& rect) override; 359 const gfx::Rect& rect) override;
359 void ShowAvatarBubbleFromAvatarButton( 360 void ShowAvatarBubbleFromAvatarButton(
360 AvatarBubbleMode mode, 361 AvatarBubbleMode mode,
361 const signin::ManageAccountsParams& manage_accounts_params) override; 362 const signin::ManageAccountsParams& manage_accounts_params) override;
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; 701 scoped_ptr<ImmersiveModeController> immersive_mode_controller_;
701 702
702 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 703 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
703 704
704 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 705 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
705 706
706 DISALLOW_COPY_AND_ASSIGN(BrowserView); 707 DISALLOW_COPY_AND_ASSIGN(BrowserView);
707 }; 708 };
708 709
709 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 710 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698