OLD | NEW |
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 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 ChromeToMobileService::IsChromeToMobileEnabled()) { | 498 ChromeToMobileService::IsChromeToMobileEnabled()) { |
499 CreateChromeToMobileButton(); | 499 CreateChromeToMobileButton(); |
500 gtk_box_pack_end(GTK_BOX(hbox_.get()), chrome_to_mobile_view_.get(), | 500 gtk_box_pack_end(GTK_BOX(hbox_.get()), chrome_to_mobile_view_.get(), |
501 FALSE, FALSE, 0); | 501 FALSE, FALSE, 0); |
502 command_updater_->AddCommandObserver(IDC_CHROME_TO_MOBILE_PAGE, this); | 502 command_updater_->AddCommandObserver(IDC_CHROME_TO_MOBILE_PAGE, this); |
503 ChromeToMobileServiceFactory::GetForProfile(browser_->profile())-> | 503 ChromeToMobileServiceFactory::GetForProfile(browser_->profile())-> |
504 RequestMobileListUpdate(); | 504 RequestMobileListUpdate(); |
505 } | 505 } |
506 } | 506 } |
507 | 507 |
508 CreateZoomButton(); | 508 // TODO(khorimoto): Uncomment the following 2 lines when zoom icon/bubble |
509 gtk_box_pack_end(GTK_BOX(hbox_.get()), zoom_.get(), FALSE, FALSE, 0); | 509 // implementation is complete for M23. |
| 510 // CreateZoomButton(); |
| 511 // gtk_box_pack_end(GTK_BOX(hbox_.get()), zoom_.get(), FALSE, FALSE, 0); |
510 | 512 |
511 content_setting_hbox_.Own(gtk_hbox_new(FALSE, kInnerPadding + 1)); | 513 content_setting_hbox_.Own(gtk_hbox_new(FALSE, kInnerPadding + 1)); |
512 gtk_widget_set_name(content_setting_hbox_.get(), | 514 gtk_widget_set_name(content_setting_hbox_.get(), |
513 "chrome-content-setting-hbox"); | 515 "chrome-content-setting-hbox"); |
514 gtk_box_pack_end(GTK_BOX(hbox_.get()), content_setting_hbox_.get(), | 516 gtk_box_pack_end(GTK_BOX(hbox_.get()), content_setting_hbox_.get(), |
515 FALSE, FALSE, 1); | 517 FALSE, FALSE, 1); |
516 | 518 |
517 for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { | 519 for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { |
518 ContentSettingImageViewGtk* content_setting_view = | 520 ContentSettingImageViewGtk* content_setting_view = |
519 new ContentSettingImageViewGtk( | 521 new ContentSettingImageViewGtk( |
(...skipping 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2052 } | 2054 } |
2053 | 2055 |
2054 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( | 2056 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( |
2055 ExtensionAction* action) { | 2057 ExtensionAction* action) { |
2056 ExtensionPopupGtk::Show( | 2058 ExtensionPopupGtk::Show( |
2057 action->GetPopupUrl(current_tab_id_), | 2059 action->GetPopupUrl(current_tab_id_), |
2058 owner_->browser_, | 2060 owner_->browser_, |
2059 event_box_.get(), | 2061 event_box_.get(), |
2060 ExtensionPopupGtk::SHOW_AND_INSPECT); | 2062 ExtensionPopupGtk::SHOW_AND_INSPECT); |
2061 } | 2063 } |
OLD | NEW |