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

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

Issue 8277018: Move content_switches to content\public\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 #include "content/browser/host_zoom_map.h" 141 #include "content/browser/host_zoom_map.h"
142 #include "content/browser/plugin_service.h" 142 #include "content/browser/plugin_service.h"
143 #include "content/browser/renderer_host/render_view_host.h" 143 #include "content/browser/renderer_host/render_view_host.h"
144 #include "content/browser/site_instance.h" 144 #include "content/browser/site_instance.h"
145 #include "content/browser/tab_contents/interstitial_page.h" 145 #include "content/browser/tab_contents/interstitial_page.h"
146 #include "content/browser/tab_contents/navigation_controller.h" 146 #include "content/browser/tab_contents/navigation_controller.h"
147 #include "content/browser/tab_contents/navigation_entry.h" 147 #include "content/browser/tab_contents/navigation_entry.h"
148 #include "content/browser/tab_contents/tab_contents_view.h" 148 #include "content/browser/tab_contents/tab_contents_view.h"
149 #include "content/browser/user_metrics.h" 149 #include "content/browser/user_metrics.h"
150 #include "content/common/content_restriction.h" 150 #include "content/common/content_restriction.h"
151 #include "content/common/content_switches.h"
152 #include "content/common/notification_details.h" 151 #include "content/common/notification_details.h"
153 #include "content/common/notification_service.h" 152 #include "content/common/notification_service.h"
154 #include "content/common/page_zoom.h" 153 #include "content/common/page_zoom.h"
154 #include "content/public/common/content_switches.h"
155 #include "grit/chromium_strings.h" 155 #include "grit/chromium_strings.h"
156 #include "grit/generated_resources.h" 156 #include "grit/generated_resources.h"
157 #include "grit/locale_settings.h" 157 #include "grit/locale_settings.h"
158 #include "grit/theme_resources_standard.h" 158 #include "grit/theme_resources_standard.h"
159 #include "net/base/cookie_monster.h" 159 #include "net/base/cookie_monster.h"
160 #include "net/base/net_util.h" 160 #include "net/base/net_util.h"
161 #include "net/base/registry_controlled_domain.h" 161 #include "net/base/registry_controlled_domain.h"
162 #include "net/url_request/url_request_context.h" 162 #include "net/url_request/url_request_context.h"
163 #include "ui/base/animation/animation.h" 163 #include "ui/base/animation/animation.h"
164 #include "ui/base/l10n/l10n_util.h" 164 #include "ui/base/l10n/l10n_util.h"
(...skipping 5122 matching lines...) Expand 10 before | Expand all | Expand 10 after
5287 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); 5287 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
5288 } else if (is_type_tabbed()) { 5288 } else if (is_type_tabbed()) {
5289 GlobalErrorService* service = 5289 GlobalErrorService* service =
5290 GlobalErrorServiceFactory::GetForProfile(profile()); 5290 GlobalErrorServiceFactory::GetForProfile(profile());
5291 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5291 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5292 if (error) { 5292 if (error) {
5293 error->ShowBubbleView(this); 5293 error->ShowBubbleView(this);
5294 } 5294 }
5295 } 5295 }
5296 } 5296 }
OLDNEW
« no previous file with comments | « chrome/browser/magic_iframe_browsertest.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698