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

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

Issue 12225042: Remove NativeTabbedPane[Win|Wrapper]; promote Views impl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rewrite a good portion of TabbedPane. Created 7 years, 10 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/collected_cookies_views.h" 5 #include "chrome/browser/ui/views/collected_cookies_views.h"
6 6
7 #include "chrome/browser/api/infobars/infobar_service.h" 7 #include "chrome/browser/api/infobars/infobar_service.h"
8 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" 8 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
9 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" 9 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
10 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" 10 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 GridLayout* layout = GridLayout::CreatePanel(this); 286 GridLayout* layout = GridLayout::CreatePanel(this);
287 SetLayoutManager(layout); 287 SetLayoutManager(layout);
288 288
289 const int single_column_layout_id = 0; 289 const int single_column_layout_id = 0;
290 views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id); 290 views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
291 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, 291 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
292 GridLayout::USE_PREF, 0, 0); 292 GridLayout::USE_PREF, 0, 0);
293 293
294 layout->StartRow(0, single_column_layout_id); 294 layout->StartRow(0, single_column_layout_id);
295 views::TabbedPane* tabbed_pane = new views::TabbedPane(); 295 views::TabbedPane* tabbed_pane = new views::TabbedPane();
296 // This color matches native_tabbed_pane_views.cc's kTabBorderColor. 296 // This color matches tabbed_pane.cc's kTabBorderColor.
297 const SkColor border_color = SkColorSetRGB(0xCC, 0xCC, 0xCC); 297 const SkColor border_color = SkColorSetRGB(0xCC, 0xCC, 0xCC);
298 // TODO(msw): Remove border and expand bounds in new dialog style. 298 // TODO(msw): Remove border and expand bounds in new dialog style.
299 tabbed_pane->set_border(views::Border::CreateSolidBorder(1, border_color)); 299 tabbed_pane->set_border(views::Border::CreateSolidBorder(1, border_color));
300 300
301 layout->AddView(tabbed_pane); 301 layout->AddView(tabbed_pane);
302 // NOTE: Panes must be added after |tabbed_pane| has been added to its parent. 302 // NOTE: Panes must be added after |tabbed_pane| has been added to its parent.
303 string16 label_allowed = l10n_util::GetStringUTF16( 303 string16 label_allowed = l10n_util::GetStringUTF16(
304 IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_TAB_LABEL); 304 IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_TAB_LABEL);
305 string16 label_blocked = l10n_util::GetStringUTF16( 305 string16 label_blocked = l10n_util::GetStringUTF16(
306 IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_TAB_LABEL); 306 IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_TAB_LABEL);
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 /////////////////////////////////////////////////////////////////////////////// 508 ///////////////////////////////////////////////////////////////////////////////
509 // CollectedCookiesViews, content::NotificationObserver implementation: 509 // CollectedCookiesViews, content::NotificationObserver implementation:
510 510
511 void CollectedCookiesViews::Observe( 511 void CollectedCookiesViews::Observe(
512 int type, 512 int type,
513 const content::NotificationSource& source, 513 const content::NotificationSource& source,
514 const content::NotificationDetails& details) { 514 const content::NotificationDetails& details) {
515 DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type); 515 DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type);
516 window_->CloseWebContentsModalDialog(); 516 window_->CloseWebContentsModalDialog();
517 } 517 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698