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

Side by Side Diff: chrome/browser/views/tabs/tab_renderer.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/views/tabs/tab_2.cc ('k') | chrome/browser/views/tabs/tab_renderer.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_VIEWS_TABS_TAB_RENDERER_H__ 5 #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
6 #define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__ 6 #define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
7 7
8 #include "app/animation.h" 8 #include "app/animation.h"
9 #include "app/slide_animation.h" 9 #include "app/slide_animation.h"
10 #include "app/throb_animation.h" 10 #include "app/throb_animation.h"
11 #include "base/gfx/point.h" 11 #include "base/gfx/point.h"
12 #include "base/string16.h"
12 #include "views/controls/button/image_button.h" 13 #include "views/controls/button/image_button.h"
13 #include "views/view.h" 14 #include "views/view.h"
14 15
15 class TabContents; 16 class TabContents;
16 17
17 /////////////////////////////////////////////////////////////////////////////// 18 ///////////////////////////////////////////////////////////////////////////////
18 // 19 //
19 // TabRenderer 20 // TabRenderer
20 // 21 //
21 // A View that renders a Tab, either in a TabStrip or in a DraggedTabView. 22 // A View that renders a Tab, either in a TabStrip or in a DraggedTabView.
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 scoped_ptr<SlideAnimation> hover_animation_; 159 scoped_ptr<SlideAnimation> hover_animation_;
159 160
160 // Pulse animation. 161 // Pulse animation.
161 scoped_ptr<ThrobAnimation> pulse_animation_; 162 scoped_ptr<ThrobAnimation> pulse_animation_;
162 163
163 // Model data. We store this here so that we don't need to ask the underlying 164 // Model data. We store this here so that we don't need to ask the underlying
164 // model, which is tricky since instances of this object can outlive the 165 // model, which is tricky since instances of this object can outlive the
165 // corresponding objects in the underlying model. 166 // corresponding objects in the underlying model.
166 struct TabData { 167 struct TabData {
167 SkBitmap favicon; 168 SkBitmap favicon;
168 std::wstring title; 169 string16 title;
169 bool loading; 170 bool loading;
170 bool crashed; 171 bool crashed;
171 bool off_the_record; 172 bool off_the_record;
172 bool show_icon; 173 bool show_icon;
173 int background_vertical_offset; 174 int background_vertical_offset;
174 }; 175 };
175 TabData data_; 176 TabData data_;
176 177
177 struct TabImage { 178 struct TabImage {
178 SkBitmap* image_l; 179 SkBitmap* image_l;
(...skipping 26 matching lines...) Expand all
205 206
206 ThemeProvider* theme_provider_; 207 ThemeProvider* theme_provider_;
207 208
208 static void InitClass(); 209 static void InitClass();
209 static bool initialized_; 210 static bool initialized_;
210 211
211 DISALLOW_EVIL_CONSTRUCTORS(TabRenderer); 212 DISALLOW_EVIL_CONSTRUCTORS(TabRenderer);
212 }; 213 };
213 214
214 #endif // CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__ 215 #endif // CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
OLDNEW
« no previous file with comments | « chrome/browser/views/tabs/tab_2.cc ('k') | chrome/browser/views/tabs/tab_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698