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

Side by Side Diff: chrome/browser/geolocation/chrome_geolocation_permission_context.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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/first_run/try_chrome_dialog_view.cc ('k') | chrome/browser/history/top_sites.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/geolocation/chrome_geolocation_permission_context.h" 5 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
6 6
7 #include <functional> 7 #include <functional>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 19 matching lines...) Expand all
30 #include "content/public/browser/navigation_entry.h" 30 #include "content/public/browser/navigation_entry.h"
31 #include "content/public/browser/notification_details.h" 31 #include "content/public/browser/notification_details.h"
32 #include "content/public/browser/notification_registrar.h" 32 #include "content/public/browser/notification_registrar.h"
33 #include "content/public/browser/notification_source.h" 33 #include "content/public/browser/notification_source.h"
34 #include "content/public/browser/notification_types.h" 34 #include "content/public/browser/notification_types.h"
35 #include "content/public/browser/render_view_host.h" 35 #include "content/public/browser/render_view_host.h"
36 #include "content/public/browser/web_contents.h" 36 #include "content/public/browser/web_contents.h"
37 #include "grit/generated_resources.h" 37 #include "grit/generated_resources.h"
38 #include "grit/locale_settings.h" 38 #include "grit/locale_settings.h"
39 #include "grit/theme_resources.h" 39 #include "grit/theme_resources.h"
40 #include "grit/theme_resources_standard.h"
41 #include "net/base/net_util.h" 40 #include "net/base/net_util.h"
42 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" 41 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
44 #include "ui/base/l10n/l10n_util.h" 43 #include "ui/base/l10n/l10n_util.h"
45 #include "ui/base/resource/resource_bundle.h" 44 #include "ui/base/resource/resource_bundle.h"
46 45
47 using WebKit::WebSecurityOrigin; 46 using WebKit::WebSecurityOrigin;
48 using content::BrowserThread; 47 using content::BrowserThread;
49 using content::NavigationEntry; 48 using content::NavigationEntry;
50 using content::OpenURLParams; 49 using content::OpenURLParams;
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 BrowserThread::UI, FROM_HERE, 704 BrowserThread::UI, FROM_HERE,
706 base::Bind( 705 base::Bind(
707 &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest, 706 &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
708 this, render_process_id, render_view_id, bridge_id)); 707 this, render_process_id, render_view_id, bridge_id));
709 return; 708 return;
710 } 709 }
711 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 710 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
712 geolocation_infobar_queue_controller_->CancelInfoBarRequest(render_process_id, 711 geolocation_infobar_queue_controller_->CancelInfoBarRequest(render_process_id,
713 render_view_id, bridge_id); 712 render_view_id, bridge_id);
714 } 713 }
OLDNEW
« no previous file with comments | « chrome/browser/first_run/try_chrome_dialog_view.cc ('k') | chrome/browser/history/top_sites.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698