chrome/browser/ui/views/location_bar/content_setting_image_view.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

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/content_setting_image_view.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/ui/views/location_bar/action_box_button_view.cc ('k') | chrome/browser/ui/views/location_bar/icon_label_bubble_view.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) 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/content_setting_image_view.h"	5 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	8 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

9 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"	9 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

10 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"	10 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"

11 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"	11 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"

12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"	12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

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

14 #include "ui/base/l10n/l10n_util.h"	14 #include "ui/base/l10n/l10n_util.h"

15 #include "ui/base/resource/resource_bundle.h"	15 #include "ui/base/resource/resource_bundle.h"

16 #include "ui/gfx/color_utils.h"	16 #include "ui/gfx/color_utils.h"

17 #include "ui/views/controls/image_view.h"	17 #include "ui/views/controls/image_view.h"

(...skipping 235 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
253 parent_->delegate()->CreateViewsBubble(new ContentSettingBubbleContents(	253 parent_->delegate()->CreateViewsBubble(new ContentSettingBubbleContents(

254 ContentSettingBubbleModel::CreateContentSettingBubbleModel(	254 ContentSettingBubbleModel::CreateContentSettingBubbleModel(

255 parent_->delegate()->GetContentSettingBubbleModelDelegate(),	255 parent_->delegate()->GetContentSettingBubbleModelDelegate(),

256 web_contents, parent_->profile(),	256 web_contents, parent_->profile(),

257 content_setting_image_model_->get_content_settings_type()),	257 content_setting_image_model_->get_content_settings_type()),

258 web_contents, this, views::BubbleBorder::TOP_RIGHT));	258 web_contents, this, views::BubbleBorder::TOP_RIGHT));

259 bubble_widget_->AddObserver(this);	259 bubble_widget_->AddObserver(this);

260 bubble_widget_->Show();	260 bubble_widget_->Show();

261 }	261 }

262 }	262 }

OLD	NEW