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

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

Issue 10978016: Remove two functions on WebContentsDelegate which didn't belong in content. They were only called f… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: don't log history for prerender on android Created 8 years, 2 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_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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 virtual bool IsPopupOrPanel( 550 virtual bool IsPopupOrPanel(
551 const content::WebContents* source) const OVERRIDE; 551 const content::WebContents* source) const OVERRIDE;
552 virtual void UpdateTargetURL(content::WebContents* source, int32 page_id, 552 virtual void UpdateTargetURL(content::WebContents* source, int32 page_id,
553 const GURL& url) OVERRIDE; 553 const GURL& url) OVERRIDE;
554 virtual void ContentsMouseEvent(content::WebContents* source, 554 virtual void ContentsMouseEvent(content::WebContents* source,
555 const gfx::Point& location, 555 const gfx::Point& location,
556 bool motion) OVERRIDE; 556 bool motion) OVERRIDE;
557 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; 557 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
558 virtual void WebContentsFocused(content::WebContents* content) OVERRIDE; 558 virtual void WebContentsFocused(content::WebContents* content) OVERRIDE;
559 virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE; 559 virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;
560 virtual bool IsApplication() const OVERRIDE;
561 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 560 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
562 virtual void BeforeUnloadFired(content::WebContents* source, 561 virtual void BeforeUnloadFired(content::WebContents* source,
563 bool proceed, 562 bool proceed,
564 bool* proceed_to_fire_unload) OVERRIDE; 563 bool* proceed_to_fire_unload) OVERRIDE;
565 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; 564 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
566 virtual void RenderWidgetShowing() OVERRIDE; 565 virtual void RenderWidgetShowing() OVERRIDE;
567 virtual int GetExtraRenderViewHeight() const OVERRIDE; 566 virtual int GetExtraRenderViewHeight() const OVERRIDE;
568 virtual void OnStartDownload(content::WebContents* source, 567 virtual void OnStartDownload(content::WebContents* source,
569 content::DownloadItem* download) OVERRIDE; 568 content::DownloadItem* download) OVERRIDE;
570 virtual void ViewSourceForTab(content::WebContents* source, 569 virtual void ViewSourceForTab(content::WebContents* source,
571 const GURL& page_url) OVERRIDE; 570 const GURL& page_url) OVERRIDE;
572 virtual void ViewSourceForFrame( 571 virtual void ViewSourceForFrame(
573 content::WebContents* source, 572 content::WebContents* source,
574 const GURL& frame_url, 573 const GURL& frame_url,
575 const std::string& frame_content_state) OVERRIDE; 574 const std::string& frame_content_state) OVERRIDE;
576 virtual void ShowRepostFormWarningDialog( 575 virtual void ShowRepostFormWarningDialog(
577 content::WebContents* source) OVERRIDE; 576 content::WebContents* source) OVERRIDE;
578 virtual bool ShouldAddNavigationToHistory(
579 const history::HistoryAddPageArgs& add_page_args,
580 content::NavigationType navigation_type) OVERRIDE;
581 virtual bool ShouldCreateWebContents( 577 virtual bool ShouldCreateWebContents(
582 content::WebContents* web_contents, 578 content::WebContents* web_contents,
583 int route_id, 579 int route_id,
584 WindowContainerType window_container_type, 580 WindowContainerType window_container_type,
585 const string16& frame_name, 581 const string16& frame_name,
586 const GURL& target_url) OVERRIDE; 582 const GURL& target_url) OVERRIDE;
587 virtual void WebContentsCreated(content::WebContents* source_contents, 583 virtual void WebContentsCreated(content::WebContents* source_contents,
588 int64 source_frame_id, 584 int64 source_frame_id,
589 const GURL& target_url, 585 const GURL& target_url,
590 content::WebContents* new_contents) OVERRIDE; 586 content::WebContents* new_contents) OVERRIDE;
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 bool window_has_shown_; 931 bool window_has_shown_;
936 932
937 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 933 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
938 // before DidEndColorChooser is called. 934 // before DidEndColorChooser is called.
939 scoped_ptr<content::ColorChooser> color_chooser_; 935 scoped_ptr<content::ColorChooser> color_chooser_;
940 936
941 DISALLOW_COPY_AND_ASSIGN(Browser); 937 DISALLOW_COPY_AND_ASSIGN(Browser);
942 }; 938 };
943 939
944 #endif // CHROME_BROWSER_UI_BROWSER_H_ 940 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698