chrome/browser/ui/views/location_bar/zoom_view.cc - Issue 11418043: Remove TabContents from OmniboxEditController and friends.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/location_bar/zoom_view.cc

Issue 11418043: Remove TabContents from OmniboxEditController and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cros Created 8 years, 1 month 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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "chrome/browser/ui/views/location_bar/zoom_view.h"	5 #include "chrome/browser/ui/views/location_bar/zoom_view.h"

6	6

7 #include "chrome/browser/ui/tab_contents/tab_contents.h"

8 #include "chrome/browser/ui/toolbar/toolbar_model.h"	7 #include "chrome/browser/ui/toolbar/toolbar_model.h"

9 #include "chrome/browser/ui/view_ids.h"	8 #include "chrome/browser/ui/view_ids.h"

10 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"	9 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"

11 #include "chrome/browser/ui/zoom/zoom_controller.h"	10 #include "chrome/browser/ui/zoom/zoom_controller.h"

12 #include "grit/generated_resources.h"	11 #include "grit/generated_resources.h"

13 #include "grit/theme_resources.h"	12 #include "grit/theme_resources.h"

14 #include "ui/base/accessibility/accessible_view_state.h"	13 #include "ui/base/accessibility/accessible_view_state.h"

15 #include "ui/base/events/event.h"	14 #include "ui/base/events/event.h"

16 #include "ui/base/l10n/l10n_util.h"	15 #include "ui/base/l10n/l10n_util.h"

17 #include "ui/base/resource/resource_bundle.h"	16 #include "ui/base/resource/resource_bundle.h"

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
81 ActivateBubble();	80 ActivateBubble();

82 return ui::ER_CONSUMED;	81 return ui::ER_CONSUMED;

83 }	82 }

84	83

85 int ZoomView::GetBuiltInHorizontalPadding() const {	84 int ZoomView::GetBuiltInHorizontalPadding() const {

86 return GetBuiltInHorizontalPaddingImpl();	85 return GetBuiltInHorizontalPaddingImpl();

87 }	86 }

88	87

89 void ZoomView::ActivateBubble() {	88 void ZoomView::ActivateBubble() {

90 ZoomBubbleView::ShowBubble(	89 ZoomBubbleView::ShowBubble(

91 this, location_bar_delegate_->GetTabContents()->web_contents(), false);	90 this, location_bar_delegate_->GetWebContents(), false);

92 }	91 }

OLD	NEW

« no previous file with comments | « chrome/browser/ui/views/location_bar/web_intents_button_view.cc ('k') | chrome/browser/ui/views/toolbar_view.h » ('j') | no next file with comments »