chrome/browser/ui/views/options/passwords_exceptions_window_view.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/options/passwords_exceptions_window_view.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Retrying upload after AppEngine error Created 9 years, 11 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

« base/sys_info_win.cc ('K') | « chrome/browser/ui/views/options/options_page_view.cc ('k') | chrome/browser/ui/views/options/passwords_page_view.h » ('j') | chrome/browser/ui/views/tabs/dragged_tab_controller.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/views/options/passwords_exceptions_window_view.h"	5 #include "chrome/browser/ui/views/options/passwords_exceptions_window_view.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/views/options/passwords_page_view.h"	9 #include "chrome/browser/ui/views/options/passwords_page_view.h"

10 #include "chrome/browser/views/options/exceptions_page_view.h"	10 #include "chrome/browser/ui/views/options/exceptions_page_view.h"

11 #include "grit/generated_resources.h"	11 #include "grit/generated_resources.h"

12 #include "grit/locale_settings.h"	12 #include "grit/locale_settings.h"

13 #include "views/controls/tabbed_pane/tabbed_pane.h"	13 #include "views/controls/tabbed_pane/tabbed_pane.h"

14 #include "views/window/window.h"	14 #include "views/window/window.h"

15	15

16 // static	16 // static

17 PasswordsExceptionsWindowView* PasswordsExceptionsWindowView::instance_ = NULL;	17 PasswordsExceptionsWindowView* PasswordsExceptionsWindowView::instance_ = NULL;

18	18

19 static const int kDialogPadding = 7;	19 static const int kDialogPadding = 7;

20	20

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 AddChildView(tabs_);	104 AddChildView(tabs_);

105	105

106 passwords_page_view_ = new PasswordsPageView(profile_);	106 passwords_page_view_ = new PasswordsPageView(profile_);

107 tabs_->AddTab(UTF16ToWide(l10n_util::GetStringUTF16(	107 tabs_->AddTab(UTF16ToWide(l10n_util::GetStringUTF16(

108 IDS_PASSWORDS_SHOW_PASSWORDS_TAB_TITLE)), passwords_page_view_);	108 IDS_PASSWORDS_SHOW_PASSWORDS_TAB_TITLE)), passwords_page_view_);

109	109

110 exceptions_page_view_ = new ExceptionsPageView(profile_);	110 exceptions_page_view_ = new ExceptionsPageView(profile_);

111 tabs_->AddTab(UTF16ToWide(l10n_util::GetStringUTF16(	111 tabs_->AddTab(UTF16ToWide(l10n_util::GetStringUTF16(

112 IDS_PASSWORDS_EXCEPTIONS_TAB_TITLE)), exceptions_page_view_);	112 IDS_PASSWORDS_EXCEPTIONS_TAB_TITLE)), exceptions_page_view_);

113 }	113 }

OLD	NEW