chrome/browser/ui/views/tabs/tab_renderer_data.h - Issue 10662032: alternate ntp (cros/partial-win): add tab-related stuff and toolbar/tab background change

Side by Side Diff: chrome/browser/ui/views/tabs/tab_renderer_data.h

Issue 10662032: alternate ntp (cros/partial-win): add tab-related stuff and toolbar/tab background change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: removed images from cl Created 8 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

« chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc ('K') | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/tabs/tab_renderer_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 CHROME_BROWSER_UI_VIEWS_TABS_TAB_RENDERER_DATA_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_RENDERER_DATA_H_

6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_RENDERER_DATA_H_	6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_RENDERER_DATA_H_

7 #pragma once	7 #pragma once

8	8

9 #include "base/process_util.h"	9 #include "base/process_util.h"

10 #include "base/string16.h"	10 #include "base/string16.h"

	11 #include "chrome/browser/ui/search/search_types.h"

	12 #include "chrome/browser/ui/search/toolbar_search_animator.h"

11 #include "googleurl/src/gurl.h"	13 #include "googleurl/src/gurl.h"

12 #include "third_party/skia/include/core/SkBitmap.h"	14 #include "third_party/skia/include/core/SkBitmap.h"

13	15

14 // Wraps the state needed by the renderers.	16 // Wraps the state needed by the renderers.

15 struct TabRendererData {	17 struct TabRendererData {

16 // Different types of network activity for a tab. The NetworkState of a tab	18 // Different types of network activity for a tab. The NetworkState of a tab

17 // may be used to alter the UI (e.g. show different kinds of loading	19 // may be used to alter the UI (e.g. show different kinds of loading

18 // animations).	20 // animations).

19 enum NetworkState {	21 enum NetworkState {

20 NETWORK_STATE_NONE, // no network activity.	22 NETWORK_STATE_NONE, // no network activity.

(...skipping 21 matching lines...) Expand all Loading...
42 NetworkState network_state;	44 NetworkState network_state;

43 string16 title;	45 string16 title;

44 GURL url;	46 GURL url;

45 bool loading;	47 bool loading;

46 base::TerminationStatus crashed_status;	48 base::TerminationStatus crashed_status;

47 bool incognito;	49 bool incognito;

48 bool show_icon;	50 bool show_icon;

49 bool mini;	51 bool mini;

50 bool blocked;	52 bool blocked;

51 bool app;	53 bool app;

	54 bool search_enabled;
	sky 2012/06/26 17:11:27 search_enabled shouldn't be per tab. Put a method search_enabled shouldn't be per tab. Put a method to determine if search is enabled on TabController. kuan 2012/06/26 23:25:49 Done. i assume u meant add the method all the way Show quoted text On 2012/06/26 17:11:27, sky wrote: > search_enabled shouldn't be per tab. Put a method to determine if search is > enabled on TabController. Done. i assume u meant add the method all the way up including TabStripController. sky 2012/06/27 00:06:17 I was thinking you would pass the state into the T Show quoted text On 2012/06/26 23:25:49, kuan wrote: > On 2012/06/26 17:11:27, sky wrote: > > search_enabled shouldn't be per tab. Put a method to determine if search is > > enabled on TabController. > > Done. i assume u meant add the method all the way up including > TabStripController. I was thinking you would pass the state into the TabStrip so that it doesn't need to be on TabStripController. kuan 2012/06/27 00:50:03 Done. Show quoted text On 2012/06/27 00:06:17, sky wrote: > On 2012/06/26 23:25:49, kuan wrote: > > On 2012/06/26 17:11:27, sky wrote: > > > search_enabled shouldn't be per tab. Put a method to determine if search is > > > enabled on TabController. > > > > Done. i assume u meant add the method all the way up including > > TabStripController. > > I was thinking you would pass the state into the TabStrip so that it doesn't > need to be on TabStripController. Done.
	55 chrome::search::Mode::Type mode;

	56 // Only applicable if \|mode\| is chrome::search::Mode::SEARCH.

	57 chrome::search::ToolbarSearchAnimator::BackgroundState background_state;

	58 // Only applicable if \|background_state\| is or a combination including

	59 // chrome::search::ToolbarSearchAnimator::BACKGROUND_STATE_SHOW_NEW;

	60 int new_background_opacity;

52 };	61 };

53	62

54 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_RENDERER_DATA_H_	63 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_RENDERER_DATA_H_

OLD	NEW