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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 514493002: Cleanup: Remove unneeded grit include in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@grit_clean_chromium_strings_401588_a
Patch Set: rebase Created 6 years, 3 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 (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/content_settings/content_setting_bubble_model.h" 5 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
28 #include "chrome/common/render_messages.h" 28 #include "chrome/common/render_messages.h"
29 #include "chrome/grit/generated_resources.h" 29 #include "chrome/grit/generated_resources.h"
30 #include "content/public/browser/notification_service.h" 30 #include "content/public/browser/notification_service.h"
31 #include "content/public/browser/render_frame_host.h" 31 #include "content/public/browser/render_frame_host.h"
32 #include "content/public/browser/render_process_host.h" 32 #include "content/public/browser/render_process_host.h"
33 #include "content/public/browser/render_view_host.h" 33 #include "content/public/browser/render_view_host.h"
34 #include "content/public/browser/user_metrics.h" 34 #include "content/public/browser/user_metrics.h"
35 #include "content/public/browser/web_contents.h" 35 #include "content/public/browser/web_contents.h"
36 #include "content/public/browser/web_contents_delegate.h" 36 #include "content/public/browser/web_contents_delegate.h"
37 #include "grit/theme_resources.h"
38 #include "net/base/net_util.h" 37 #include "net/base/net_util.h"
39 #include "ui/base/l10n/l10n_util.h" 38 #include "ui/base/l10n/l10n_util.h"
40 #include "ui/base/resource/resource_bundle.h" 39 #include "ui/base/resource/resource_bundle.h"
41 #include "ui/resources/grit/ui_resources.h" 40 #include "ui/resources/grit/ui_resources.h"
42 41
43 using base::UserMetricsAction; 42 using base::UserMetricsAction;
44 using content::WebContents; 43 using content::WebContents;
45 using content_settings::SettingInfo; 44 using content_settings::SettingInfo;
46 using content_settings::SettingSource; 45 using content_settings::SettingSource;
47 using content_settings::SETTING_SOURCE_USER; 46 using content_settings::SETTING_SOURCE_USER;
(...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) { 1321 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
1323 DCHECK_EQ(web_contents_, 1322 DCHECK_EQ(web_contents_,
1324 content::Source<WebContents>(source).ptr()); 1323 content::Source<WebContents>(source).ptr());
1325 web_contents_ = NULL; 1324 web_contents_ = NULL;
1326 } else { 1325 } else {
1327 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type); 1326 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
1328 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr()); 1327 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
1329 profile_ = NULL; 1328 profile_ = NULL;
1330 } 1329 }
1331 } 1330 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698