OLD | NEW |
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_action_view.h" | 5 #include "chrome/browser/ui/views/toolbar/browser_action_view.h" |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/extensions/api/commands/command_service.h" | 9 #include "chrome/browser/extensions/api/commands/command_service.h" |
10 #include "chrome/browser/extensions/extension_action.h" | 10 #include "chrome/browser/extensions/extension_action.h" |
11 #include "chrome/browser/extensions/extension_action_manager.h" | 11 #include "chrome/browser/extensions/extension_action_manager.h" |
12 #include "chrome/browser/extensions/extension_context_menu_model.h" | 12 #include "chrome/browser/extensions/extension_context_menu_model.h" |
13 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/themes/theme_service.h" | 15 #include "chrome/browser/themes/theme_service.h" |
16 #include "chrome/browser/themes/theme_service_factory.h" | 16 #include "chrome/browser/themes/theme_service_factory.h" |
17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/browser/ui/view_ids.h" |
18 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" | 19 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
19 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 20 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
20 #include "extensions/common/extension.h" | 21 #include "extensions/common/extension.h" |
21 #include "extensions/common/manifest_constants.h" | 22 #include "extensions/common/manifest_constants.h" |
22 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
23 #include "grit/theme_resources.h" | 24 #include "grit/theme_resources.h" |
24 #include "ui/accessibility/ax_view_state.h" | 25 #include "ui/accessibility/ax_view_state.h" |
25 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
26 #include "ui/base/resource/resource_bundle.h" | 27 #include "ui/base/resource/resource_bundle.h" |
27 #include "ui/events/event.h" | 28 #include "ui/events/event.h" |
(...skipping 16 matching lines...) Expand all Loading... |
44 return true; | 45 return true; |
45 } | 46 } |
46 | 47 |
47 BrowserActionView::BrowserActionView(const Extension* extension, | 48 BrowserActionView::BrowserActionView(const Extension* extension, |
48 Browser* browser, | 49 Browser* browser, |
49 BrowserActionView::Delegate* delegate) | 50 BrowserActionView::Delegate* delegate) |
50 : browser_(browser), | 51 : browser_(browser), |
51 delegate_(delegate), | 52 delegate_(delegate), |
52 button_(NULL), | 53 button_(NULL), |
53 extension_(extension) { | 54 extension_(extension) { |
| 55 set_id(VIEW_ID_BROWSER_ACTION); |
54 button_ = new BrowserActionButton(extension_, browser_, delegate_); | 56 button_ = new BrowserActionButton(extension_, browser_, delegate_); |
55 button_->set_drag_controller(delegate_); | 57 button_->set_drag_controller(delegate_); |
56 button_->set_owned_by_client(); | 58 button_->set_owned_by_client(); |
57 AddChildView(button_); | 59 AddChildView(button_); |
58 button_->UpdateState(); | 60 button_->UpdateState(); |
59 } | 61 } |
60 | 62 |
61 BrowserActionView::~BrowserActionView() { | 63 BrowserActionView::~BrowserActionView() { |
62 button_->Destroy(); | 64 button_->Destroy(); |
63 } | 65 } |
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 extensions::Command browser_action_command; | 423 extensions::Command browser_action_command; |
422 if (!only_if_active || !command_service->GetBrowserActionCommand( | 424 if (!only_if_active || !command_service->GetBrowserActionCommand( |
423 extension_->id(), | 425 extension_->id(), |
424 extensions::CommandService::ACTIVE_ONLY, | 426 extensions::CommandService::ACTIVE_ONLY, |
425 &browser_action_command, | 427 &browser_action_command, |
426 NULL)) { | 428 NULL)) { |
427 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); | 429 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); |
428 keybinding_.reset(NULL); | 430 keybinding_.reset(NULL); |
429 } | 431 } |
430 } | 432 } |
OLD | NEW |