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

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

Issue 11233076: Fix spurious visibility events when committing Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebaseline Created 8 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 | 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 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 virtual views::View* GetTabContentsContainerView() const OVERRIDE; 359 virtual views::View* GetTabContentsContainerView() const OVERRIDE;
360 virtual ToolbarView* GetToolbarView() const OVERRIDE; 360 virtual ToolbarView* GetToolbarView() const OVERRIDE;
361 361
362 // Overridden from TabStripModelObserver: 362 // Overridden from TabStripModelObserver:
363 virtual void TabDetachedAt(TabContents* contents, int index) OVERRIDE; 363 virtual void TabDetachedAt(TabContents* contents, int index) OVERRIDE;
364 virtual void TabDeactivated(TabContents* contents) OVERRIDE; 364 virtual void TabDeactivated(TabContents* contents) OVERRIDE;
365 virtual void ActiveTabChanged(TabContents* old_contents, 365 virtual void ActiveTabChanged(TabContents* old_contents,
366 TabContents* new_contents, 366 TabContents* new_contents,
367 int index, 367 int index,
368 bool user_gesture) OVERRIDE; 368 bool user_gesture) OVERRIDE;
369 virtual void TabReplacedAt(TabStripModel* tab_strip_model,
370 TabContents* old_contents,
371 TabContents* new_contents,
372 int index) OVERRIDE;
373 virtual void TabStripEmpty() OVERRIDE; 369 virtual void TabStripEmpty() OVERRIDE;
374 370
375 // Overridden from ui::AcceleratorProvider: 371 // Overridden from ui::AcceleratorProvider:
376 virtual bool GetAcceleratorForCommandId(int command_id, 372 virtual bool GetAcceleratorForCommandId(int command_id,
377 ui::Accelerator* accelerator) OVERRIDE; 373 ui::Accelerator* accelerator) OVERRIDE;
378 374
379 // Overridden from views::WidgetDelegate: 375 // Overridden from views::WidgetDelegate:
380 virtual bool CanResize() const OVERRIDE; 376 virtual bool CanResize() const OVERRIDE;
381 virtual bool CanMaximize() const OVERRIDE; 377 virtual bool CanMaximize() const OVERRIDE;
382 virtual bool CanActivate() const OVERRIDE; 378 virtual bool CanActivate() const OVERRIDE;
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 556
561 // Initialize the hung plugin detector. 557 // Initialize the hung plugin detector.
562 void InitHangMonitor(); 558 void InitHangMonitor();
563 559
564 // Possibly records a user metrics action corresponding to the passed-in 560 // Possibly records a user metrics action corresponding to the passed-in
565 // accelerator. Only implemented for Chrome OS, where we're interested in 561 // accelerator. Only implemented for Chrome OS, where we're interested in
566 // learning about how frequently the top-row keys are used. 562 // learning about how frequently the top-row keys are used.
567 void UpdateAcceleratorMetrics(const ui::Accelerator& accelerator, 563 void UpdateAcceleratorMetrics(const ui::Accelerator& accelerator,
568 int command_id); 564 int command_id);
569 565
570 // Invoked from ActiveTabChanged or when instant is made active.
571 // |new_contents| must not be NULL.
572 void ProcessTabSelected(TabContents* new_contents);
573
574 // Exposes resize corner size to BrowserViewLayout. 566 // Exposes resize corner size to BrowserViewLayout.
575 gfx::Size GetResizeCornerSize() const; 567 gfx::Size GetResizeCornerSize() const;
576 568
577 // Create an icon for this window in the launcher (currently only for Ash). 569 // Create an icon for this window in the launcher (currently only for Ash).
578 void CreateLauncherIcon(); 570 void CreateLauncherIcon();
579 571
580 // Calls |method| which is either RenderWidgetHost::Cut, ::Copy, or ::Paste 572 // Calls |method| which is either RenderWidgetHost::Cut, ::Copy, or ::Paste
581 // and returns true if the focus is currently on a WebContent. 573 // and returns true if the focus is currently on a WebContent.
582 bool DoCutCopyPaste(void (content::RenderWidgetHost::*method)()); 574 bool DoCutCopyPaste(void (content::RenderWidgetHost::*method)());
583 575
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 scoped_ptr<SearchViewController> search_view_controller_; 732 scoped_ptr<SearchViewController> search_view_controller_;
741 733
742 scoped_ptr<InstantPreviewControllerViews> preview_controller_; 734 scoped_ptr<InstantPreviewControllerViews> preview_controller_;
743 735
744 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 736 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
745 737
746 DISALLOW_COPY_AND_ASSIGN(BrowserView); 738 DISALLOW_COPY_AND_ASSIGN(BrowserView);
747 }; 739 };
748 740
749 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 741 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698