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

Side by Side Diff: content/browser/tab_contents/tab_contents.h

Issue 6901003: Revert my recent changes regarding title directionality. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyrights Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 const ViewHostMsg_FrameNavigate_Params& params); 738 const ViewHostMsg_FrameNavigate_Params& params);
739 739
740 // Saves the given title to the navigation entry and does associated work. It 740 // Saves the given title to the navigation entry and does associated work. It
741 // will update history and the view for the new title, and also synthesize 741 // will update history and the view for the new title, and also synthesize
742 // titles for file URLs that have none (so we require that the URL of the 742 // titles for file URLs that have none (so we require that the URL of the
743 // entry already be set). 743 // entry already be set).
744 // 744 //
745 // This is used as the backend for state updates, which include a new title, 745 // This is used as the backend for state updates, which include a new title,
746 // or the dedicated set title message. It returns true if the new title is 746 // or the dedicated set title message. It returns true if the new title is
747 // different and was therefore updated. 747 // different and was therefore updated.
748 bool UpdateTitleForEntry(NavigationEntry* entry, 748 bool UpdateTitleForEntry(NavigationEntry* entry, const std::wstring& title);
749 const base::i18n::String16WithDirection& title);
750 749
751 // Causes the TabContents to navigate in the right renderer to |entry|, which 750 // Causes the TabContents to navigate in the right renderer to |entry|, which
752 // must be already part of the entries in the navigation controller. 751 // must be already part of the entries in the navigation controller.
753 // This does not change the NavigationController state. 752 // This does not change the NavigationController state.
754 bool NavigateToEntry(const NavigationEntry& entry, 753 bool NavigateToEntry(const NavigationEntry& entry,
755 NavigationController::ReloadType reload_type); 754 NavigationController::ReloadType reload_type);
756 755
757 // Misc non-view stuff ------------------------------------------------------- 756 // Misc non-view stuff -------------------------------------------------------
758 757
759 // Helper functions for sending notifications. 758 // Helper functions for sending notifications.
(...skipping 20 matching lines...) Expand all
780 virtual void RenderViewReady(RenderViewHost* render_view_host); 779 virtual void RenderViewReady(RenderViewHost* render_view_host);
781 virtual void RenderViewGone(RenderViewHost* render_view_host, 780 virtual void RenderViewGone(RenderViewHost* render_view_host,
782 base::TerminationStatus status, 781 base::TerminationStatus status,
783 int error_code); 782 int error_code);
784 virtual void RenderViewDeleted(RenderViewHost* render_view_host); 783 virtual void RenderViewDeleted(RenderViewHost* render_view_host);
785 virtual void DidNavigate(RenderViewHost* render_view_host, 784 virtual void DidNavigate(RenderViewHost* render_view_host,
786 const ViewHostMsg_FrameNavigate_Params& params); 785 const ViewHostMsg_FrameNavigate_Params& params);
787 virtual void UpdateState(RenderViewHost* render_view_host, 786 virtual void UpdateState(RenderViewHost* render_view_host,
788 int32 page_id, 787 int32 page_id,
789 const std::string& state); 788 const std::string& state);
790 virtual void UpdateTitle( 789 virtual void UpdateTitle(RenderViewHost* render_view_host,
791 RenderViewHost* render_view_host, 790 int32 page_id,
792 int32 page_id, 791 const std::wstring& title);
793 const base::i18n::String16WithDirection& title) OVERRIDE;
794 virtual void UpdateEncoding(RenderViewHost* render_view_host, 792 virtual void UpdateEncoding(RenderViewHost* render_view_host,
795 const std::string& encoding); 793 const std::string& encoding);
796 virtual void UpdateTargetURL(int32 page_id, const GURL& url); 794 virtual void UpdateTargetURL(int32 page_id, const GURL& url);
797 virtual void UpdateInspectorSetting(const std::string& key, 795 virtual void UpdateInspectorSetting(const std::string& key,
798 const std::string& value); 796 const std::string& value);
799 virtual void ClearInspectorSettings(); 797 virtual void ClearInspectorSettings();
800 virtual void Close(RenderViewHost* render_view_host); 798 virtual void Close(RenderViewHost* render_view_host);
801 virtual void RequestMove(const gfx::Rect& new_bounds); 799 virtual void RequestMove(const gfx::Rect& new_bounds);
802 virtual void DidStartLoading(); 800 virtual void DidStartLoading();
803 virtual void DidStopLoading(); 801 virtual void DidStopLoading();
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 ObserverList<TabContentsObserver> observers_; 1058 ObserverList<TabContentsObserver> observers_;
1061 1059
1062 // Content restrictions, used to disable print/copy etc based on content's 1060 // Content restrictions, used to disable print/copy etc based on content's
1063 // (full-page plugins for now only) permissions. 1061 // (full-page plugins for now only) permissions.
1064 int content_restrictions_; 1062 int content_restrictions_;
1065 1063
1066 DISALLOW_COPY_AND_ASSIGN(TabContents); 1064 DISALLOW_COPY_AND_ASSIGN(TabContents);
1067 }; 1065 };
1068 1066
1069 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 1067 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW
« no previous file with comments | « content/browser/tab_contents/render_view_host_manager_unittest.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698