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

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

Issue 10911020: Enable commands API for platform apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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/views/browser_actions_container.h" 5 #include "chrome/browser/ui/views/browser_actions_container.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/prefs/pref_service.h" 9 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 : profile_(browser->profile()), 62 : profile_(browser->profile()),
63 browser_(browser), 63 browser_(browser),
64 owner_view_(owner_view), 64 owner_view_(owner_view),
65 popup_(NULL), 65 popup_(NULL),
66 popup_button_(NULL), 66 popup_button_(NULL),
67 model_(NULL), 67 model_(NULL),
68 container_width_(0), 68 container_width_(0),
69 chevron_(NULL), 69 chevron_(NULL),
70 overflow_menu_(NULL), 70 overflow_menu_(NULL),
71 extension_keybinding_registry_(browser->profile(), 71 extension_keybinding_registry_(browser->profile(),
72 owner_view->GetFocusManager()), 72 owner_view->GetFocusManager(),
73 extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS),
73 suppress_chevron_(false), 74 suppress_chevron_(false),
74 resize_amount_(0), 75 resize_amount_(0),
75 animation_target_size_(0), 76 animation_target_size_(0),
76 drop_indicator_position_(-1), 77 drop_indicator_position_(-1),
77 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), 78 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
78 ALLOW_THIS_IN_INITIALIZER_LIST(show_menu_task_factory_(this)) { 79 ALLOW_THIS_IN_INITIALIZER_LIST(show_menu_task_factory_(this)) {
79 set_id(VIEW_ID_BROWSER_ACTION_TOOLBAR); 80 set_id(VIEW_ID_BROWSER_ACTION_TOOLBAR);
80 81
81 if (profile_->GetExtensionService()) { 82 if (profile_->GetExtensionService()) {
82 model_ = profile_->GetExtensionService()->toolbar_model(); 83 model_ = profile_->GetExtensionService()->toolbar_model();
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 views::BubbleBorder::ArrowLocation arrow_location = base::i18n::IsRTL() ? 812 views::BubbleBorder::ArrowLocation arrow_location = base::i18n::IsRTL() ?
812 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT; 813 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;
813 popup_ = ExtensionPopup::ShowPopup(popup_url, 814 popup_ = ExtensionPopup::ShowPopup(popup_url,
814 browser_, 815 browser_,
815 reference_view, 816 reference_view,
816 arrow_location); 817 arrow_location);
817 popup_->GetWidget()->AddObserver(this); 818 popup_->GetWidget()->AddObserver(this);
818 popup_button_ = button; 819 popup_button_ = button;
819 popup_button_->SetButtonPushed(); 820 popup_button_->SetButtonPushed();
820 } 821 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698