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

Side by Side Diff: chrome/browser/ui/views/toolbar/browser_actions_container.cc

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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/views/toolbar/browser_actions_container.h" 5 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "chrome/browser/extensions/extension_util.h" 9 #include "chrome/browser/extensions/extension_util.h"
10 #include "chrome/browser/extensions/extension_view_host.h" 10 #include "chrome/browser/extensions/extension_view_host.h"
11 #include "chrome/browser/extensions/tab_helper.h" 11 #include "chrome/browser/extensions/tab_helper.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" 15 #include "chrome/browser/ui/tabs/tab_strip_model.h"
16 #include "chrome/browser/ui/view_ids.h" 16 #include "chrome/browser/ui/view_ids.h"
17 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" 17 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
18 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h" 18 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"
19 #include "chrome/browser/ui/views/extensions/extension_popup.h" 19 #include "chrome/browser/ui/views/extensions/extension_popup.h"
20 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h" 20 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"
21 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 21 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
22 #include "chrome/common/extensions/command.h" 22 #include "chrome/common/extensions/command.h"
23 #include "extensions/browser/extension_registry.h" 23 #include "extensions/browser/extension_registry.h"
24 #include "extensions/browser/extension_system.h" 24 #include "extensions/browser/extension_system.h"
25 #include "extensions/browser/runtime_data.h" 25 #include "extensions/browser/runtime_data.h"
26 #include "extensions/common/feature_switch.h" 26 #include "extensions/common/feature_switch.h"
27 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
28 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 #include "grit/ui_resources.h"
30 #include "third_party/skia/include/core/SkColor.h" 29 #include "third_party/skia/include/core/SkColor.h"
31 #include "ui/accessibility/ax_view_state.h" 30 #include "ui/accessibility/ax_view_state.h"
32 #include "ui/base/dragdrop/drag_utils.h" 31 #include "ui/base/dragdrop/drag_utils.h"
33 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/nine_image_painter_factory.h" 33 #include "ui/base/nine_image_painter_factory.h"
35 #include "ui/base/resource/resource_bundle.h" 34 #include "ui/base/resource/resource_bundle.h"
36 #include "ui/base/theme_provider.h" 35 #include "ui/base/theme_provider.h"
37 #include "ui/gfx/animation/slide_animation.h" 36 #include "ui/gfx/animation/slide_animation.h"
38 #include "ui/gfx/canvas.h" 37 #include "ui/gfx/canvas.h"
39 #include "ui/gfx/geometry/rect.h" 38 #include "ui/gfx/geometry/rect.h"
39 #include "ui/resources/grit/ui_resources.h"
40 #include "ui/views/controls/button/label_button_border.h" 40 #include "ui/views/controls/button/label_button_border.h"
41 #include "ui/views/controls/button/menu_button.h" 41 #include "ui/views/controls/button/menu_button.h"
42 #include "ui/views/controls/resize_area.h" 42 #include "ui/views/controls/resize_area.h"
43 #include "ui/views/metrics.h" 43 #include "ui/views/metrics.h"
44 #include "ui/views/painter.h" 44 #include "ui/views/painter.h"
45 #include "ui/views/widget/widget.h" 45 #include "ui/views/widget/widget.h"
46 46
47 using extensions::Extension; 47 using extensions::Extension;
48 48
49 namespace { 49 namespace {
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 1032
1033 for (BrowserActionViews::iterator iter = browser_action_views_.begin(); 1033 for (BrowserActionViews::iterator iter = browser_action_views_.begin();
1034 iter != browser_action_views_.end(); ++iter) { 1034 iter != browser_action_views_.end(); ++iter) {
1035 BrowserActionView* view = (*iter); 1035 BrowserActionView* view = (*iter);
1036 if (view->extension() == extension) 1036 if (view->extension() == extension)
1037 return view->view_controller()->ExecuteAction( 1037 return view->view_controller()->ExecuteAction(
1038 ExtensionPopup::SHOW, grant_tab_permissions); 1038 ExtensionPopup::SHOW, grant_tab_permissions);
1039 } 1039 }
1040 return false; 1040 return false;
1041 } 1041 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/website_settings/permissions_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698