chrome/browser/ui/toolbar/toolbar_model.h - Issue 9479008: Re-factor location bar/toolbar code to get rid of the browser dependency.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/toolbar/toolbar_model.h

Issue 9479008: Re-factor location bar/toolbar code to get rid of the browser dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ut fix Created 8 years, 9 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/content_settings/content_setting_bubble_model.h ('K') | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/toolbar/toolbar_model.cc » ('j') | chrome/browser/ui/views/reload_button.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/toolbar_model.h

diff --git a/chrome/browser/ui/toolbar/toolbar_model.h b/chrome/browser/ui/toolbar/toolbar_model.h

index e15fed6129aac66870fdcdec876004c5ff95dac2..d180ccda9987a07020746b6bfa321d4470b0ae2f 100644

--- a/chrome/browser/ui/toolbar/toolbar_model.h

+++ b/chrome/browser/ui/toolbar/toolbar_model.h

@@ -11,7 +11,7 @@

#include "base/basictypes.h"

#include "base/string16.h"

-class Browser;

+class ToolbarModelHost;

namespace content {

class NavigationController;

@@ -39,7 +39,7 @@ class ToolbarModel {

NUM_SECURITY_LEVELS,

};

- explicit ToolbarModel(Browser* browser);

+ explicit ToolbarModel(ToolbarModelHost* host);

~ToolbarModel();

// Returns the text that should be displayed in the location bar.

@@ -75,7 +75,8 @@ class ToolbarModel {

// If this returns NULL, default values are used.

content::NavigationController* GetNavigationController() const;

- Browser* browser_;

+ // ToolbarModel's host.

sky 2012/03/12 20:59:19 nit: remove this comment, it doesn't give any more

altimofeev 2012/03/13 15:38:05 Done.

+ ToolbarModelHost* host_;

// Whether the text in the location bar is currently being edited.

bool input_in_progress_;