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

Side by Side Diff: chrome/browser/gtk/tabs/tab_renderer_gtk.h

Issue 155334: Convert some stuff to string16 so the toolkit_views build can build again (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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/gtk/browser_window_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_renderer_gtk.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_GTK_TABS_TAB_RENDERER_GTK_H_ 5 #ifndef CHROME_BROWSER_GTK_TABS_TAB_RENDERER_GTK_H_
6 #define CHROME_BROWSER_GTK_TABS_TAB_RENDERER_GTK_H_ 6 #define CHROME_BROWSER_GTK_TABS_TAB_RENDERER_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "app/animation.h" 10 #include "app/animation.h"
11 #include "app/gfx/canvas.h" 11 #include "app/gfx/canvas.h"
12 #include "app/gfx/font.h" 12 #include "app/gfx/font.h"
13 #include "app/slide_animation.h" 13 #include "app/slide_animation.h"
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/gfx/rect.h" 15 #include "base/gfx/rect.h"
16 #include "base/string16.h"
16 #include "chrome/common/owned_widget_gtk.h" 17 #include "chrome/common/owned_widget_gtk.h"
17 #include "third_party/skia/include/core/SkBitmap.h" 18 #include "third_party/skia/include/core/SkBitmap.h"
18 19
19 namespace gfx { 20 namespace gfx {
20 class Size; 21 class Size;
21 } // namespace gfx 22 } // namespace gfx
22 23
23 class CustomDrawButton; 24 class CustomDrawButton;
24 class TabContents; 25 class TabContents;
25 class ThemeProvider; 26 class ThemeProvider;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 void OnMouseExited(); 154 void OnMouseExited();
154 155
155 private: 156 private:
156 class FavIconCrashAnimation; 157 class FavIconCrashAnimation;
157 158
158 // Model data. We store this here so that we don't need to ask the underlying 159 // Model data. We store this here so that we don't need to ask the underlying
159 // model, which is tricky since instances of this object can outlive the 160 // model, which is tricky since instances of this object can outlive the
160 // corresponding objects in the underlying model. 161 // corresponding objects in the underlying model.
161 struct TabData { 162 struct TabData {
162 SkBitmap favicon; 163 SkBitmap favicon;
163 std::wstring title; 164 string16 title;
164 bool loading; 165 bool loading;
165 bool crashed; 166 bool crashed;
166 bool off_the_record; 167 bool off_the_record;
167 bool show_icon; 168 bool show_icon;
168 }; 169 };
169 170
170 // TODO(jhawkins): Move into TabResources class. 171 // TODO(jhawkins): Move into TabResources class.
171 struct TabImage { 172 struct TabImage {
172 SkBitmap* image_l; 173 SkBitmap* image_l;
173 SkBitmap* image_c; 174 SkBitmap* image_c;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 // still render the old theme for this tab. 299 // still render the old theme for this tab.
299 ThemeProvider* theme_provider_; 300 ThemeProvider* theme_provider_;
300 301
301 // The close button. 302 // The close button.
302 scoped_ptr<CustomDrawButton> close_button_; 303 scoped_ptr<CustomDrawButton> close_button_;
303 304
304 DISALLOW_COPY_AND_ASSIGN(TabRendererGtk); 305 DISALLOW_COPY_AND_ASSIGN(TabRendererGtk);
305 }; 306 };
306 307
307 #endif // CHROME_BROWSER_GTK_TABS_TAB_RENDERER_GTK_H_ 308 #endif // CHROME_BROWSER_GTK_TABS_TAB_RENDERER_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/gtk/browser_window_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_renderer_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698