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

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

Issue 11824050: InstantExtended: Committed NTP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo to fix blacklisting. Created 7 years, 10 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
« no previous file with comments | « chrome/browser/instant/instant_test_utils.cc ('k') | chrome/browser/ui/browser.cc » ('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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 virtual void ContentsMouseEvent(content::WebContents* source, 549 virtual void ContentsMouseEvent(content::WebContents* source,
550 const gfx::Point& location, 550 const gfx::Point& location,
551 bool motion) OVERRIDE; 551 bool motion) OVERRIDE;
552 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; 552 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
553 virtual void WebContentsFocused(content::WebContents* content) OVERRIDE; 553 virtual void WebContentsFocused(content::WebContents* content) OVERRIDE;
554 virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE; 554 virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;
555 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 555 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
556 virtual void BeforeUnloadFired(content::WebContents* source, 556 virtual void BeforeUnloadFired(content::WebContents* source,
557 bool proceed, 557 bool proceed,
558 bool* proceed_to_fire_unload) OVERRIDE; 558 bool* proceed_to_fire_unload) OVERRIDE;
559 virtual bool ShouldFocusLocationBarByDefault(
560 content::WebContents* source) OVERRIDE;
559 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; 561 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
560 virtual void RenderWidgetShowing() OVERRIDE; 562 virtual void RenderWidgetShowing() OVERRIDE;
561 virtual int GetExtraRenderViewHeight() const OVERRIDE; 563 virtual int GetExtraRenderViewHeight() const OVERRIDE;
562 virtual void OnStartDownload(content::WebContents* source, 564 virtual void OnStartDownload(content::WebContents* source,
563 content::DownloadItem* download) OVERRIDE; 565 content::DownloadItem* download) OVERRIDE;
564 virtual void ViewSourceForTab(content::WebContents* source, 566 virtual void ViewSourceForTab(content::WebContents* source,
565 const GURL& page_url) OVERRIDE; 567 const GURL& page_url) OVERRIDE;
566 virtual void ViewSourceForFrame( 568 virtual void ViewSourceForFrame(
567 content::WebContents* source, 569 content::WebContents* source,
568 const GURL& frame_url, 570 const GURL& frame_url,
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 bool window_has_shown_; 934 bool window_has_shown_;
933 935
934 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 936 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
935 // before DidEndColorChooser is called. 937 // before DidEndColorChooser is called.
936 scoped_ptr<content::ColorChooser> color_chooser_; 938 scoped_ptr<content::ColorChooser> color_chooser_;
937 939
938 DISALLOW_COPY_AND_ASSIGN(Browser); 940 DISALLOW_COPY_AND_ASSIGN(Browser);
939 }; 941 };
940 942
941 #endif // CHROME_BROWSER_UI_BROWSER_H_ 943 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/instant/instant_test_utils.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698