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

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

Issue 686463004: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 public views::WidgetObserver, 92 public views::WidgetObserver,
93 public views::ClientView, 93 public views::ClientView,
94 public infobars::InfoBarContainer::Delegate, 94 public infobars::InfoBarContainer::Delegate,
95 public LoadCompleteListener::Delegate, 95 public LoadCompleteListener::Delegate,
96 public OmniboxPopupModelObserver { 96 public OmniboxPopupModelObserver {
97 public: 97 public:
98 // The browser view's class name. 98 // The browser view's class name.
99 static const char kViewClassName[]; 99 static const char kViewClassName[];
100 100
101 BrowserView(); 101 BrowserView();
102 virtual ~BrowserView(); 102 ~BrowserView() override;
103 103
104 // Takes ownership of |browser|. 104 // Takes ownership of |browser|.
105 void Init(Browser* browser); 105 void Init(Browser* browser);
106 106
107 void set_frame(BrowserFrame* frame) { frame_ = frame; } 107 void set_frame(BrowserFrame* frame) { frame_ = frame; }
108 BrowserFrame* frame() const { return frame_; } 108 BrowserFrame* frame() const { return frame_; }
109 109
110 // Returns a pointer to the BrowserView* interface implementation (an 110 // Returns a pointer to the BrowserView* interface implementation (an
111 // instance of this object, typically) for a given native window, or NULL if 111 // instance of this object, typically) for a given native window, or NULL if
112 // there is no such association. 112 // there is no such association.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // Called after the widget's fullscreen state is changed without going through 239 // Called after the widget's fullscreen state is changed without going through
240 // FullscreenController. This method does any processing which was skipped. 240 // FullscreenController. This method does any processing which was skipped.
241 // Only exiting fullscreen in this way is currently supported. 241 // Only exiting fullscreen in this way is currently supported.
242 void FullscreenStateChanged(); 242 void FullscreenStateChanged();
243 243
244 // Called from BookmarkBarView/DownloadShelfView during their show/hide 244 // Called from BookmarkBarView/DownloadShelfView during their show/hide
245 // animations. 245 // animations.
246 void ToolbarSizeChanged(bool is_animating); 246 void ToolbarSizeChanged(bool is_animating);
247 247
248 // Overridden from BrowserWindow: 248 // Overridden from BrowserWindow:
249 virtual void Show() override; 249 void Show() override;
250 virtual void ShowInactive() override; 250 void ShowInactive() override;
251 virtual void Hide() override; 251 void Hide() override;
252 virtual void SetBounds(const gfx::Rect& bounds) override; 252 void SetBounds(const gfx::Rect& bounds) override;
253 virtual void Close() override; 253 void Close() override;
254 virtual void Activate() override; 254 void Activate() override;
255 virtual void Deactivate() override; 255 void Deactivate() override;
256 virtual bool IsActive() const override; 256 bool IsActive() const override;
257 virtual void FlashFrame(bool flash) override; 257 void FlashFrame(bool flash) override;
258 virtual bool IsAlwaysOnTop() const override; 258 bool IsAlwaysOnTop() const override;
259 virtual void SetAlwaysOnTop(bool always_on_top) override; 259 void SetAlwaysOnTop(bool always_on_top) override;
260 virtual gfx::NativeWindow GetNativeWindow() override; 260 gfx::NativeWindow GetNativeWindow() override;
261 virtual BrowserWindowTesting* GetBrowserWindowTesting() override; 261 BrowserWindowTesting* GetBrowserWindowTesting() override;
262 virtual StatusBubble* GetStatusBubble() override; 262 StatusBubble* GetStatusBubble() override;
263 virtual void UpdateTitleBar() override; 263 void UpdateTitleBar() override;
264 virtual void BookmarkBarStateChanged( 264 void BookmarkBarStateChanged(
265 BookmarkBar::AnimateChangeType change_type) override; 265 BookmarkBar::AnimateChangeType change_type) override;
266 virtual void UpdateDevTools() override; 266 void UpdateDevTools() override;
267 virtual void UpdateLoadingAnimations(bool should_animate) override; 267 void UpdateLoadingAnimations(bool should_animate) override;
268 virtual void SetStarredState(bool is_starred) override; 268 void SetStarredState(bool is_starred) override;
269 virtual void SetTranslateIconToggled(bool is_lit) override; 269 void SetTranslateIconToggled(bool is_lit) override;
270 virtual void OnActiveTabChanged(content::WebContents* old_contents, 270 void OnActiveTabChanged(content::WebContents* old_contents,
271 content::WebContents* new_contents, 271 content::WebContents* new_contents,
272 int index, 272 int index,
273 int reason) override; 273 int reason) override;
274 virtual void ZoomChangedForActiveTab(bool can_show_bubble) override; 274 void ZoomChangedForActiveTab(bool can_show_bubble) override;
275 virtual gfx::Rect GetRestoredBounds() const override; 275 gfx::Rect GetRestoredBounds() const override;
276 virtual ui::WindowShowState GetRestoredState() const override; 276 ui::WindowShowState GetRestoredState() const override;
277 virtual gfx::Rect GetBounds() const override; 277 gfx::Rect GetBounds() const override;
278 virtual bool IsMaximized() const override; 278 bool IsMaximized() const override;
279 virtual bool IsMinimized() const override; 279 bool IsMinimized() const override;
280 virtual void Maximize() override; 280 void Maximize() override;
281 virtual void Minimize() override; 281 void Minimize() override;
282 virtual void Restore() override; 282 void Restore() override;
283 virtual void EnterFullscreen( 283 void EnterFullscreen(const GURL& url,
284 const GURL& url, FullscreenExitBubbleType bubble_type) override; 284 FullscreenExitBubbleType bubble_type) override;
285 virtual void ExitFullscreen() override; 285 void ExitFullscreen() override;
286 virtual void UpdateFullscreenExitBubbleContent( 286 void UpdateFullscreenExitBubbleContent(
287 const GURL& url, 287 const GURL& url,
288 FullscreenExitBubbleType bubble_type) override; 288 FullscreenExitBubbleType bubble_type) override;
289 virtual bool ShouldHideUIForFullscreen() const override; 289 bool ShouldHideUIForFullscreen() const override;
290 virtual bool IsFullscreen() const override; 290 bool IsFullscreen() const override;
291 virtual bool IsFullscreenBubbleVisible() const override; 291 bool IsFullscreenBubbleVisible() const override;
292 #if defined(OS_WIN) 292 #if defined(OS_WIN)
293 virtual void SetMetroSnapMode(bool enable) override; 293 virtual void SetMetroSnapMode(bool enable) override;
294 virtual bool IsInMetroSnapMode() const override; 294 virtual bool IsInMetroSnapMode() const override;
295 #endif 295 #endif
296 virtual LocationBar* GetLocationBar() const override; 296 LocationBar* GetLocationBar() const override;
297 virtual void SetFocusToLocationBar(bool select_all) override; 297 void SetFocusToLocationBar(bool select_all) override;
298 virtual void UpdateReloadStopState(bool is_loading, bool force) override; 298 void UpdateReloadStopState(bool is_loading, bool force) override;
299 virtual void UpdateToolbar(content::WebContents* contents) override; 299 void UpdateToolbar(content::WebContents* contents) override;
300 virtual void FocusToolbar() override; 300 void FocusToolbar() override;
301 virtual void FocusAppMenu() override; 301 void FocusAppMenu() override;
302 virtual void FocusBookmarksToolbar() override; 302 void FocusBookmarksToolbar() override;
303 virtual void FocusInfobars() override; 303 void FocusInfobars() override;
304 virtual void RotatePaneFocus(bool forwards) override; 304 void RotatePaneFocus(bool forwards) override;
305 virtual void DestroyBrowser() override; 305 void DestroyBrowser() override;
306 virtual bool IsBookmarkBarVisible() const override; 306 bool IsBookmarkBarVisible() const override;
307 virtual bool IsBookmarkBarAnimating() const override; 307 bool IsBookmarkBarAnimating() const override;
308 virtual bool IsTabStripEditable() const override; 308 bool IsTabStripEditable() const override;
309 virtual bool IsToolbarVisible() const override; 309 bool IsToolbarVisible() const override;
310 virtual gfx::Rect GetRootWindowResizerRect() const override; 310 gfx::Rect GetRootWindowResizerRect() const override;
311 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 311 void ConfirmAddSearchProvider(TemplateURL* template_url,
312 Profile* profile) override; 312 Profile* profile) override;
313 virtual void ShowUpdateChromeDialog() override; 313 void ShowUpdateChromeDialog() override;
314 virtual void ShowBookmarkBubble(const GURL& url, 314 void ShowBookmarkBubble(const GURL& url, bool already_bookmarked) override;
315 bool already_bookmarked) override; 315 void ShowBookmarkAppBubble(const WebApplicationInfo& web_app_info,
316 virtual void ShowBookmarkAppBubble( 316 const std::string& extension_id) override;
317 const WebApplicationInfo& web_app_info, 317 void ShowTranslateBubble(content::WebContents* contents,
318 const std::string& extension_id) override; 318 translate::TranslateStep step,
319 virtual void ShowTranslateBubble( 319 translate::TranslateErrors::Type error_type,
320 content::WebContents* contents, 320 bool is_user_gesture) override;
321 translate::TranslateStep step,
322 translate::TranslateErrors::Type error_type,
323 bool is_user_gesture) override;
324 #if defined(ENABLE_ONE_CLICK_SIGNIN) 321 #if defined(ENABLE_ONE_CLICK_SIGNIN)
325 virtual void ShowOneClickSigninBubble( 322 void ShowOneClickSigninBubble(
326 OneClickSigninBubbleType type, 323 OneClickSigninBubbleType type,
327 const base::string16& email, 324 const base::string16& email,
328 const base::string16& error_message, 325 const base::string16& error_message,
329 const StartSyncCallback& start_sync_callback) override; 326 const StartSyncCallback& start_sync_callback) override;
330 #endif 327 #endif
331 // TODO(beng): Not an override, move somewhere else. 328 // TODO(beng): Not an override, move somewhere else.
332 void SetDownloadShelfVisible(bool visible); 329 void SetDownloadShelfVisible(bool visible);
333 virtual bool IsDownloadShelfVisible() const override; 330 bool IsDownloadShelfVisible() const override;
334 virtual DownloadShelf* GetDownloadShelf() override; 331 DownloadShelf* GetDownloadShelf() override;
335 virtual void ConfirmBrowserCloseWithPendingDownloads( 332 void ConfirmBrowserCloseWithPendingDownloads(
336 int download_count, 333 int download_count,
337 Browser::DownloadClosePreventionType dialog_type, 334 Browser::DownloadClosePreventionType dialog_type,
338 bool app_modal, 335 bool app_modal,
339 const base::Callback<void(bool)>& callback) override; 336 const base::Callback<void(bool)>& callback) override;
340 virtual void UserChangedTheme() override; 337 void UserChangedTheme() override;
341 virtual int GetExtraRenderViewHeight() const override; 338 int GetExtraRenderViewHeight() const override;
342 virtual void WebContentsFocused(content::WebContents* contents) override; 339 void WebContentsFocused(content::WebContents* contents) override;
343 virtual void ShowWebsiteSettings(Profile* profile, 340 void ShowWebsiteSettings(Profile* profile,
344 content::WebContents* web_contents, 341 content::WebContents* web_contents,
345 const GURL& url, 342 const GURL& url,
346 const content::SSLStatus& ssl) override; 343 const content::SSLStatus& ssl) override;
347 virtual void ShowAppMenu() override; 344 void ShowAppMenu() override;
348 virtual bool PreHandleKeyboardEvent( 345 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event,
349 const content::NativeWebKeyboardEvent& event, 346 bool* is_keyboard_shortcut) override;
350 bool* is_keyboard_shortcut) override; 347 void HandleKeyboardEvent(
351 virtual void HandleKeyboardEvent(
352 const content::NativeWebKeyboardEvent& event) override; 348 const content::NativeWebKeyboardEvent& event) override;
353 virtual void Cut() override; 349 void Cut() override;
354 virtual void Copy() override; 350 void Copy() override;
355 virtual void Paste() override; 351 void Paste() override;
356 virtual WindowOpenDisposition GetDispositionForPopupBounds( 352 WindowOpenDisposition GetDispositionForPopupBounds(
357 const gfx::Rect& bounds) override; 353 const gfx::Rect& bounds) override;
358 virtual FindBar* CreateFindBar() override; 354 FindBar* CreateFindBar() override;
359 virtual web_modal::WebContentsModalDialogHost* 355 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
360 GetWebContentsModalDialogHost() override; 356 override;
361 virtual void ShowAvatarBubble(content::WebContents* web_contents, 357 void ShowAvatarBubble(content::WebContents* web_contents,
362 const gfx::Rect& rect) override; 358 const gfx::Rect& rect) override;
363 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, 359 void ShowAvatarBubbleFromAvatarButton(
360 AvatarBubbleMode mode,
364 const signin::ManageAccountsParams& manage_accounts_params) override; 361 const signin::ManageAccountsParams& manage_accounts_params) override;
365 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; 362 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
366 virtual void ExecuteExtensionCommand( 363 void ExecuteExtensionCommand(const extensions::Extension* extension,
367 const extensions::Extension* extension, 364 const extensions::Command& command) override;
368 const extensions::Command& command) override;
369 365
370 // Overridden from BrowserWindowTesting: 366 // Overridden from BrowserWindowTesting:
371 virtual BookmarkBarView* GetBookmarkBarView() const override; 367 BookmarkBarView* GetBookmarkBarView() const override;
372 virtual LocationBarView* GetLocationBarView() const override; 368 LocationBarView* GetLocationBarView() const override;
373 virtual views::View* GetTabContentsContainerView() const override; 369 views::View* GetTabContentsContainerView() const override;
374 virtual ToolbarView* GetToolbarView() const override; 370 ToolbarView* GetToolbarView() const override;
375 371
376 // Overridden from TabStripModelObserver: 372 // Overridden from TabStripModelObserver:
377 virtual void TabInsertedAt(content::WebContents* contents, 373 void TabInsertedAt(content::WebContents* contents,
378 int index, 374 int index,
379 bool foreground) override; 375 bool foreground) override;
380 virtual void TabDetachedAt(content::WebContents* contents, 376 void TabDetachedAt(content::WebContents* contents, int index) override;
381 int index) override; 377 void TabDeactivated(content::WebContents* contents) override;
382 virtual void TabDeactivated(content::WebContents* contents) override; 378 void TabStripEmpty() override;
383 virtual void TabStripEmpty() override; 379 void WillCloseAllTabs() override;
384 virtual void WillCloseAllTabs() override; 380 void CloseAllTabsCanceled() override;
385 virtual void CloseAllTabsCanceled() override;
386 381
387 // Overridden from ui::AcceleratorProvider: 382 // Overridden from ui::AcceleratorProvider:
388 virtual bool GetAcceleratorForCommandId(int command_id, 383 bool GetAcceleratorForCommandId(int command_id,
389 ui::Accelerator* accelerator) override; 384 ui::Accelerator* accelerator) override;
390 385
391 // Overridden from views::WidgetDelegate: 386 // Overridden from views::WidgetDelegate:
392 virtual bool CanResize() const override; 387 bool CanResize() const override;
393 virtual bool CanMaximize() const override; 388 bool CanMaximize() const override;
394 virtual bool CanMinimize() const override; 389 bool CanMinimize() const override;
395 virtual bool CanActivate() const override; 390 bool CanActivate() const override;
396 virtual base::string16 GetWindowTitle() const override; 391 base::string16 GetWindowTitle() const override;
397 virtual base::string16 GetAccessibleWindowTitle() const override; 392 base::string16 GetAccessibleWindowTitle() const override;
398 virtual views::View* GetInitiallyFocusedView() override; 393 views::View* GetInitiallyFocusedView() override;
399 virtual bool ShouldShowWindowTitle() const override; 394 bool ShouldShowWindowTitle() const override;
400 virtual gfx::ImageSkia GetWindowAppIcon() override; 395 gfx::ImageSkia GetWindowAppIcon() override;
401 virtual gfx::ImageSkia GetWindowIcon() override; 396 gfx::ImageSkia GetWindowIcon() override;
402 virtual bool ShouldShowWindowIcon() const override; 397 bool ShouldShowWindowIcon() const override;
403 virtual bool ExecuteWindowsCommand(int command_id) override; 398 bool ExecuteWindowsCommand(int command_id) override;
404 virtual std::string GetWindowName() const override; 399 std::string GetWindowName() const override;
405 virtual void SaveWindowPlacement(const gfx::Rect& bounds, 400 void SaveWindowPlacement(const gfx::Rect& bounds,
406 ui::WindowShowState show_state) override; 401 ui::WindowShowState show_state) override;
407 virtual bool GetSavedWindowPlacement( 402 bool GetSavedWindowPlacement(const views::Widget* widget,
408 const views::Widget* widget, 403 gfx::Rect* bounds,
409 gfx::Rect* bounds, 404 ui::WindowShowState* show_state) const override;
410 ui::WindowShowState* show_state) const override; 405 views::View* GetContentsView() override;
411 virtual views::View* GetContentsView() override; 406 views::ClientView* CreateClientView(views::Widget* widget) override;
412 virtual views::ClientView* CreateClientView(views::Widget* widget) override; 407 void OnWindowBeginUserBoundsChange() override;
413 virtual void OnWindowBeginUserBoundsChange() override; 408 void OnWidgetMove() override;
414 virtual void OnWidgetMove() override; 409 views::Widget* GetWidget() override;
415 virtual views::Widget* GetWidget() override; 410 const views::Widget* GetWidget() const override;
416 virtual const views::Widget* GetWidget() const override; 411 void GetAccessiblePanes(std::vector<View*>* panes) override;
417 virtual void GetAccessiblePanes(std::vector<View*>* panes) override;
418 412
419 // Overridden from views::WidgetObserver: 413 // Overridden from views::WidgetObserver:
420 virtual void OnWidgetActivationChanged(views::Widget* widget, 414 void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
421 bool active) override;
422 415
423 // Overridden from views::ClientView: 416 // Overridden from views::ClientView:
424 virtual bool CanClose() override; 417 bool CanClose() override;
425 virtual int NonClientHitTest(const gfx::Point& point) override; 418 int NonClientHitTest(const gfx::Point& point) override;
426 virtual gfx::Size GetMinimumSize() const override; 419 gfx::Size GetMinimumSize() const override;
427 420
428 // InfoBarContainer::Delegate overrides 421 // InfoBarContainer::Delegate overrides
429 virtual SkColor GetInfoBarSeparatorColor() const override; 422 SkColor GetInfoBarSeparatorColor() const override;
430 virtual void InfoBarContainerStateChanged(bool is_animating) override; 423 void InfoBarContainerStateChanged(bool is_animating) override;
431 virtual bool DrawInfoBarArrows(int* x) const override; 424 bool DrawInfoBarArrows(int* x) const override;
432 425
433 // Overridden from views::View: 426 // Overridden from views::View:
434 virtual const char* GetClassName() const override; 427 const char* GetClassName() const override;
435 virtual void Layout() override; 428 void Layout() override;
436 virtual void PaintChildren(gfx::Canvas* canvas, 429 void PaintChildren(gfx::Canvas* canvas,
437 const views::CullSet& cull_set) override; 430 const views::CullSet& cull_set) override;
438 virtual void ViewHierarchyChanged( 431 void ViewHierarchyChanged(
439 const ViewHierarchyChangedDetails& details) override; 432 const ViewHierarchyChangedDetails& details) override;
440 virtual void ChildPreferredSizeChanged(View* child) override; 433 void ChildPreferredSizeChanged(View* child) override;
441 virtual void GetAccessibleState(ui::AXViewState* state) override; 434 void GetAccessibleState(ui::AXViewState* state) override;
442 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override; 435 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
443 436
444 // Overridden from ui::AcceleratorTarget: 437 // Overridden from ui::AcceleratorTarget:
445 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; 438 bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
446 439
447 // OmniboxPopupModelObserver overrides 440 // OmniboxPopupModelObserver overrides
448 virtual void OnOmniboxPopupShownOrHidden() override; 441 void OnOmniboxPopupShownOrHidden() override;
449 442
450 // Testing interface: 443 // Testing interface:
451 views::View* GetContentsContainerForTest() { return contents_container_; } 444 views::View* GetContentsContainerForTest() { return contents_container_; }
452 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } 445 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; }
453 views::WebView* GetDevToolsWebViewForTest() { return devtools_web_view_; } 446 views::WebView* GetDevToolsWebViewForTest() { return devtools_web_view_; }
454 447
455 private: 448 private:
456 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate 449 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
457 // interface to keep these two classes decoupled and testable. 450 // interface to keep these two classes decoupled and testable.
458 friend class BrowserViewLayoutDelegateImpl; 451 friend class BrowserViewLayoutDelegateImpl;
(...skipping 11 matching lines...) Expand all
470 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes); 463 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes);
471 464
472 // Constructs and initializes the child views. 465 // Constructs and initializes the child views.
473 void InitViews(); 466 void InitViews();
474 467
475 // Callback for the loading animation(s) associated with this view. 468 // Callback for the loading animation(s) associated with this view.
476 void LoadingAnimationCallback(); 469 void LoadingAnimationCallback();
477 470
478 // LoadCompleteListener::Delegate implementation. Creates and initializes the 471 // LoadCompleteListener::Delegate implementation. Creates and initializes the
479 // |jumplist_| after the first page load. 472 // |jumplist_| after the first page load.
480 virtual void OnLoadCompleted() override; 473 void OnLoadCompleted() override;
481 474
482 // Returns the BrowserViewLayout. 475 // Returns the BrowserViewLayout.
483 BrowserViewLayout* GetBrowserViewLayout() const; 476 BrowserViewLayout* GetBrowserViewLayout() const;
484 477
485 // Returns the ContentsLayoutManager. 478 // Returns the ContentsLayoutManager.
486 ContentsLayoutManager* GetContentsLayoutManager() const; 479 ContentsLayoutManager* GetContentsLayoutManager() const;
487 480
488 // Prepare to show the Bookmark Bar for the specified WebContents. 481 // Prepare to show the Bookmark Bar for the specified WebContents.
489 // Returns true if the Bookmark Bar can be shown (i.e. it's supported for this 482 // Returns true if the Bookmark Bar can be shown (i.e. it's supported for this
490 // Browser type) and there should be a subsequent re-layout to show it. 483 // Browser type) and there should be a subsequent re-layout to show it.
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; 700 scoped_ptr<ImmersiveModeController> immersive_mode_controller_;
708 701
709 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 702 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
710 703
711 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 704 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
712 705
713 DISALLOW_COPY_AND_ASSIGN(BrowserView); 706 DISALLOW_COPY_AND_ASSIGN(BrowserView);
714 }; 707 };
715 708
716 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 709 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_root_view.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698