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

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

Issue 10377114: Remove some more OS_CHROMEOS from browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 Profile*, const Extension* app) OVERRIDE; 301 Profile*, const Extension* app) OVERRIDE;
302 virtual void Cut() OVERRIDE; 302 virtual void Cut() OVERRIDE;
303 virtual void Copy() OVERRIDE; 303 virtual void Copy() OVERRIDE;
304 virtual void Paste() OVERRIDE; 304 virtual void Paste() OVERRIDE;
305 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; 305 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE;
306 virtual void HideInstant() OVERRIDE; 306 virtual void HideInstant() OVERRIDE;
307 virtual gfx::Rect GetInstantBounds() OVERRIDE; 307 virtual gfx::Rect GetInstantBounds() OVERRIDE;
308 virtual WindowOpenDisposition GetDispositionForPopupBounds( 308 virtual WindowOpenDisposition GetDispositionForPopupBounds(
309 const gfx::Rect& bounds) OVERRIDE; 309 const gfx::Rect& bounds) OVERRIDE;
310 virtual FindBar* CreateFindBar() OVERRIDE; 310 virtual FindBar* CreateFindBar() OVERRIDE;
311 #if defined(OS_CHROMEOS)
312 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE;
313 #endif
314 virtual void ShowAvatarBubble(content::WebContents* web_contents, 311 virtual void ShowAvatarBubble(content::WebContents* web_contents,
315 const gfx::Rect& rect) OVERRIDE; 312 const gfx::Rect& rect) OVERRIDE;
316 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; 313 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE;
317 virtual void ShowPasswordGenerationBubble(const gfx::Rect& rect) OVERRIDE; 314 virtual void ShowPasswordGenerationBubble(const gfx::Rect& rect) OVERRIDE;
318 315
319 // Overridden from BrowserWindowTesting: 316 // Overridden from BrowserWindowTesting:
320 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; 317 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE;
321 virtual LocationBarView* GetLocationBarView() const OVERRIDE; 318 virtual LocationBarView* GetLocationBarView() const OVERRIDE;
322 virtual views::View* GetTabContentsContainerView() const OVERRIDE; 319 virtual views::View* GetTabContentsContainerView() const OVERRIDE;
323 virtual ToolbarView* GetToolbarView() const OVERRIDE; 320 virtual ToolbarView* GetToolbarView() const OVERRIDE;
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 bool force_location_bar_focus_; 662 bool force_location_bar_focus_;
666 663
667 PendingFullscreenRequest fullscreen_request_; 664 PendingFullscreenRequest fullscreen_request_;
668 665
669 gfx::ScopedSysColorChangeListener color_change_listener_; 666 gfx::ScopedSysColorChangeListener color_change_listener_;
670 667
671 DISALLOW_COPY_AND_ASSIGN(BrowserView); 668 DISALLOW_COPY_AND_ASSIGN(BrowserView);
672 }; 669 };
673 670
674 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 671 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698