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

Side by Side Diff: chrome/browser/ui/gtk/location_bar_view_gtk.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
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/gtk/location_bar_view_gtk.h" 5 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "chrome/common/extensions/extension.h" 70 #include "chrome/common/extensions/extension.h"
71 #include "chrome/common/extensions/extension_action.h" 71 #include "chrome/common/extensions/extension_action.h"
72 #include "chrome/common/extensions/extension_manifest_constants.h" 72 #include "chrome/common/extensions/extension_manifest_constants.h"
73 #include "chrome/common/extensions/extension_resource.h" 73 #include "chrome/common/extensions/extension_resource.h"
74 #include "chrome/common/pref_names.h" 74 #include "chrome/common/pref_names.h"
75 #include "content/public/browser/navigation_entry.h" 75 #include "content/public/browser/navigation_entry.h"
76 #include "content/public/browser/notification_service.h" 76 #include "content/public/browser/notification_service.h"
77 #include "content/public/browser/web_contents.h" 77 #include "content/public/browser/web_contents.h"
78 #include "grit/generated_resources.h" 78 #include "grit/generated_resources.h"
79 #include "grit/theme_resources.h" 79 #include "grit/theme_resources.h"
80 #include "grit/theme_resources_standard.h"
81 #include "net/base/net_util.h" 80 #include "net/base/net_util.h"
82 #include "ui/base/accelerators/accelerator_gtk.h" 81 #include "ui/base/accelerators/accelerator_gtk.h"
83 #include "ui/base/dragdrop/gtk_dnd_util.h" 82 #include "ui/base/dragdrop/gtk_dnd_util.h"
84 #include "ui/base/gtk/gtk_hig_constants.h" 83 #include "ui/base/gtk/gtk_hig_constants.h"
85 #include "ui/base/gtk/gtk_signal_registrar.h" 84 #include "ui/base/gtk/gtk_signal_registrar.h"
86 #include "ui/base/l10n/l10n_util.h" 85 #include "ui/base/l10n/l10n_util.h"
87 #include "ui/base/resource/resource_bundle.h" 86 #include "ui/base/resource/resource_bundle.h"
88 #include "ui/gfx/canvas_skia_paint.h" 87 #include "ui/gfx/canvas_skia_paint.h"
89 #include "ui/gfx/font.h" 88 #include "ui/gfx/font.h"
90 #include "ui/gfx/gtk_util.h" 89 #include "ui/gfx/gtk_util.h"
(...skipping 1889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1980 } 1979 }
1981 1980
1982 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( 1981 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
1983 ExtensionAction* action) { 1982 ExtensionAction* action) {
1984 ExtensionPopupGtk::Show( 1983 ExtensionPopupGtk::Show(
1985 action->GetPopupUrl(current_tab_id_), 1984 action->GetPopupUrl(current_tab_id_),
1986 owner_->browser_, 1985 owner_->browser_,
1987 event_box_.get(), 1986 event_box_.get(),
1988 ExtensionPopupGtk::SHOW_AND_INSPECT); 1987 ExtensionPopupGtk::SHOW_AND_INSPECT);
1989 } 1988 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc ('k') | chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698