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

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

Issue 5959008: Remove wstring from l10n_util. Part 2.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
« no previous file with comments | « chrome/browser/ssl/ssl_error_info.cc ('k') | chrome/browser/tab_contents/tab_contents.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CHROME_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>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/gtest_prod_util.h" 15 #include "base/gtest_prod_util.h"
16 #include "base/scoped_ptr.h" 16 #include "base/scoped_ptr.h"
17 #include "base/string16.h"
17 #include "chrome/browser/dom_ui/dom_ui_factory.h" 18 #include "chrome/browser/dom_ui/dom_ui_factory.h"
18 #include "chrome/browser/download/save_package.h" 19 #include "chrome/browser/download/save_package.h"
19 #include "chrome/browser/extensions/image_loading_tracker.h" 20 #include "chrome/browser/extensions/image_loading_tracker.h"
20 #include "chrome/browser/fav_icon_helper.h" 21 #include "chrome/browser/fav_icon_helper.h"
21 #include "chrome/browser/prefs/pref_change_registrar.h" 22 #include "chrome/browser/prefs/pref_change_registrar.h"
22 #include "chrome/browser/renderer_host/render_view_host_delegate.h" 23 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
23 #include "chrome/browser/tab_contents/constrained_window.h" 24 #include "chrome/browser/tab_contents/constrained_window.h"
24 #include "chrome/browser/tab_contents/language_state.h" 25 #include "chrome/browser/tab_contents/language_state.h"
25 #include "chrome/browser/tab_contents/navigation_controller.h" 26 #include "chrome/browser/tab_contents/navigation_controller.h"
26 #include "chrome/browser/tab_contents/navigation_entry.h" 27 #include "chrome/browser/tab_contents/navigation_entry.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 SkBitmap GetFavIcon() const; 254 SkBitmap GetFavIcon() const;
254 255
255 // Returns true if we are not using the default favicon. 256 // Returns true if we are not using the default favicon.
256 bool FavIconIsValid() const; 257 bool FavIconIsValid() const;
257 258
258 // Returns whether the favicon should be displayed. If this returns false, no 259 // Returns whether the favicon should be displayed. If this returns false, no
259 // space is provided for the favicon, and the favicon is never displayed. 260 // space is provided for the favicon, and the favicon is never displayed.
260 virtual bool ShouldDisplayFavIcon(); 261 virtual bool ShouldDisplayFavIcon();
261 262
262 // Returns a human-readable description the tab's loading state. 263 // Returns a human-readable description the tab's loading state.
263 virtual std::wstring GetStatusText() const; 264 virtual string16 GetStatusText() const;
264 265
265 // Add and remove observers for page navigation notifications. Adding or 266 // Add and remove observers for page navigation notifications. Adding or
266 // removing multiple times has no effect. The order in which notifications 267 // removing multiple times has no effect. The order in which notifications
267 // are sent to observers is undefined. Clients must be sure to remove the 268 // are sent to observers is undefined. Clients must be sure to remove the
268 // observer before they go away. 269 // observer before they go away.
269 void AddNavigationObserver(WebNavigationObserver* observer); 270 void AddNavigationObserver(WebNavigationObserver* observer);
270 void RemoveNavigationObserver(WebNavigationObserver* observer); 271 void RemoveNavigationObserver(WebNavigationObserver* observer);
271 272
272 // Return whether this tab contents is loading a resource. 273 // Return whether this tab contents is loading a resource.
273 bool is_loading() const { return is_loading_; } 274 bool is_loading() const { return is_loading_; }
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
1172 // a TabContents, in which case the max page ID is stored separately with 1173 // a TabContents, in which case the max page ID is stored separately with
1173 // each SiteInstance. 1174 // each SiteInstance.
1174 // TODO(brettw) this seems like it can be removed according to the comment. 1175 // TODO(brettw) this seems like it can be removed according to the comment.
1175 int32 max_page_id_; 1176 int32 max_page_id_;
1176 1177
1177 // System time at which the current load was started. 1178 // System time at which the current load was started.
1178 base::TimeTicks current_load_start_; 1179 base::TimeTicks current_load_start_;
1179 1180
1180 // The current load state and the URL associated with it. 1181 // The current load state and the URL associated with it.
1181 net::LoadState load_state_; 1182 net::LoadState load_state_;
1182 std::wstring load_state_host_; 1183 string16 load_state_host_;
1183 // Upload progress, for displaying in the status bar. 1184 // Upload progress, for displaying in the status bar.
1184 // Set to zero when there is no significant upload happening. 1185 // Set to zero when there is no significant upload happening.
1185 uint64 upload_size_; 1186 uint64 upload_size_;
1186 uint64 upload_position_; 1187 uint64 upload_position_;
1187 1188
1188 // Data for current page ----------------------------------------------------- 1189 // Data for current page -----------------------------------------------------
1189 1190
1190 // Whether we have a (non-empty) title for the current page. 1191 // Whether we have a (non-empty) title for the current page.
1191 // Used to prevent subsequent title updates from affecting history. This 1192 // Used to prevent subsequent title updates from affecting history. This
1192 // prevents some weirdness because some AJAXy apps use titles for status 1193 // prevents some weirdness because some AJAXy apps use titles for status
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
1348 // Content restrictions, used to disable print/copy etc based on content's 1349 // Content restrictions, used to disable print/copy etc based on content's
1349 // (full-page plugins for now only) permissions. 1350 // (full-page plugins for now only) permissions.
1350 int content_restrictions_; 1351 int content_restrictions_;
1351 1352
1352 // --------------------------------------------------------------------------- 1353 // ---------------------------------------------------------------------------
1353 1354
1354 DISALLOW_COPY_AND_ASSIGN(TabContents); 1355 DISALLOW_COPY_AND_ASSIGN(TabContents);
1355 }; 1356 };
1356 1357
1357 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 1358 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_error_info.cc ('k') | chrome/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698