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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 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 | Annotate | Revision Log
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 #include <cmath> 7 #include <cmath>
8 8
9 #import <AppKit/AppKit.h> 9 #import <AppKit/AppKit.h>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/ui/website_settings/website_settings_utils.h" 24 #include "chrome/browser/ui/website_settings/website_settings_utils.h"
25 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
26 #include "content/public/browser/cert_store.h" 26 #include "content/public/browser/cert_store.h"
27 #include "content/public/browser/page_navigator.h" 27 #include "content/public/browser/page_navigator.h"
28 #include "content/public/browser/ssl_host_state_delegate.h" 28 #include "content/public/browser/ssl_host_state_delegate.h"
29 #include "content/public/browser/user_metrics.h" 29 #include "content/public/browser/user_metrics.h"
30 #include "content/public/browser/web_contents.h" 30 #include "content/public/browser/web_contents.h"
31 #include "grit/chromium_strings.h" 31 #include "grit/chromium_strings.h"
32 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "grit/ui_resources.h"
35 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h" 34 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"
36 #import "ui/base/cocoa/controls/hyperlink_button_cell.h" 35 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
37 #import "ui/base/cocoa/flipped_view.h" 36 #import "ui/base/cocoa/flipped_view.h"
38 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
39 #include "ui/base/resource/resource_bundle.h" 38 #include "ui/base/resource/resource_bundle.h"
40 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 39 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
40 #include "ui/resources/grit/ui_resources.h"
41 41
42 namespace { 42 namespace {
43 43
44 // The default width of the window, in view coordinates. It may be larger to 44 // The default width of the window, in view coordinates. It may be larger to
45 // fit the content. 45 // fit the content.
46 const CGFloat kDefaultWindowWidth = 310; 46 const CGFloat kDefaultWindowWidth = 310;
47 47
48 // Spacing in between sections. 48 // Spacing in between sections.
49 const CGFloat kVerticalSpacing = 10; 49 const CGFloat kVerticalSpacing = 10;
50 50
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1224 [bubble_controller_ setPermissionInfo:permission_info_list]; 1224 [bubble_controller_ setPermissionInfo:permission_info_list];
1225 } 1225 }
1226 1226
1227 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) { 1227 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) {
1228 [bubble_controller_ setFirstVisit:first_visit]; 1228 [bubble_controller_ setFirstVisit:first_visit];
1229 } 1229 }
1230 1230
1231 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { 1231 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
1232 [bubble_controller_ setSelectedTab:tab_id]; 1232 [bubble_controller_ setSelectedTab:tab_id];
1233 } 1233 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698