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

Side by Side Diff: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

Issue 2187473003: Remove #includes of "xxx_google_chrome_strings.h". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 4 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h" 5 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 10
(...skipping 21 matching lines...) Expand all
32 #include "chrome/grit/theme_resources.h" 32 #include "chrome/grit/theme_resources.h"
33 #include "components/prefs/pref_service.h" 33 #include "components/prefs/pref_service.h"
34 #include "content/public/browser/cert_store.h" 34 #include "content/public/browser/cert_store.h"
35 #include "content/public/browser/page_navigator.h" 35 #include "content/public/browser/page_navigator.h"
36 #include "content/public/browser/ssl_host_state_delegate.h" 36 #include "content/public/browser/ssl_host_state_delegate.h"
37 #include "content/public/browser/user_metrics.h" 37 #include "content/public/browser/user_metrics.h"
38 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
39 #include "content/public/common/url_constants.h" 39 #include "content/public/common/url_constants.h"
40 #include "extensions/common/constants.h" 40 #include "extensions/common/constants.h"
41 #include "grit/components_chromium_strings.h" 41 #include "grit/components_chromium_strings.h"
42 #include "grit/components_google_chrome_strings.h"
43 #include "grit/components_strings.h" 42 #include "grit/components_strings.h"
44 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h" 43 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"
45 #include "ui/base/cocoa/cocoa_base_utils.h" 44 #include "ui/base/cocoa/cocoa_base_utils.h"
46 #import "ui/base/cocoa/controls/hyperlink_button_cell.h" 45 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
47 #import "ui/base/cocoa/flipped_view.h" 46 #import "ui/base/cocoa/flipped_view.h"
48 #import "ui/base/cocoa/hover_image_button.h" 47 #import "ui/base/cocoa/hover_image_button.h"
49 #include "ui/base/l10n/l10n_util.h" 48 #include "ui/base/l10n/l10n_util.h"
50 #include "ui/base/resource/resource_bundle.h" 49 #include "ui/base/resource/resource_bundle.h"
51 #import "ui/gfx/mac/coordinate_conversion.h" 50 #import "ui/gfx/mac/coordinate_conversion.h"
52 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 51 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
(...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 void WebsiteSettingsUIBridge::SetPermissionInfo( 1189 void WebsiteSettingsUIBridge::SetPermissionInfo(
1191 const PermissionInfoList& permission_info_list, 1190 const PermissionInfoList& permission_info_list,
1192 const ChosenObjectInfoList& chosen_object_info_list) { 1191 const ChosenObjectInfoList& chosen_object_info_list) {
1193 [bubble_controller_ setPermissionInfo:permission_info_list 1192 [bubble_controller_ setPermissionInfo:permission_info_list
1194 andChosenObjects:chosen_object_info_list]; 1193 andChosenObjects:chosen_object_info_list];
1195 } 1194 }
1196 1195
1197 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { 1196 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
1198 // TODO(lgarron): Remove this from the interface. (crbug.com/571533) 1197 // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
1199 } 1198 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698