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

Side by Side Diff: chrome/browser/views/options/options_window_view.cc

Issue 10218: Looks like a size method got left behind in the gfx update. Also make sure th... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/views/page_info_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/options_window.h" 5 #include "chrome/browser/options_window.h"
6 6
7 #include "chrome/app/locales/locale_settings.h" 7 #include "chrome/app/locales/locale_settings.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/profile.h" 9 #include "chrome/browser/profile.h"
10 #include "chrome/browser/views/options/advanced_page_view.h" 10 #include "chrome/browser/views/options/advanced_page_view.h"
11 #include "chrome/browser/views/options/content_page_view.h" 11 #include "chrome/browser/views/options/content_page_view.h"
12 #include "chrome/browser/views/options/general_page_view.h" 12 #include "chrome/browser/views/options/general_page_view.h"
13 #include "chrome/common/chrome_constants.h" 13 #include "chrome/common/chrome_constants.h"
14 #include "chrome/common/l10n_util.h" 14 #include "chrome/common/l10n_util.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "chrome/common/pref_service.h" 16 #include "chrome/common/pref_service.h"
17 #include "chrome/common/resource_bundle.h" 17 #include "chrome/common/resource_bundle.h"
18 #include "chrome/views/dialog_delegate.h" 18 #include "chrome/views/dialog_delegate.h"
19 #include "chrome/views/tabbed_pane.h" 19 #include "chrome/views/tabbed_pane.h"
20 #include "chrome/views/root_view.h" 20 #include "chrome/views/root_view.h"
21 #include "chrome/views/window.h" 21 #include "chrome/views/window.h"
22 22
23 #include "chromium_strings.h" 23 #include "chromium_strings.h"
24 #include "generated_resources.h" 24 #include "generated_resources.h"
25 25
26 static const int kDefaultWindowWidthChars = 85;
27 static const int kDefaultWindowHeightLines = 29;
28
29 /////////////////////////////////////////////////////////////////////////////// 26 ///////////////////////////////////////////////////////////////////////////////
30 // OptionsWindowView 27 // OptionsWindowView
31 // 28 //
32 // The contents of the Options dialog window. 29 // The contents of the Options dialog window.
33 // 30 //
34 class OptionsWindowView : public views::View, 31 class OptionsWindowView : public views::View,
35 public views::DialogDelegate, 32 public views::DialogDelegate,
36 public views::TabbedPane::Listener { 33 public views::TabbedPane::Listener {
37 public: 34 public:
38 explicit OptionsWindowView(Profile* profile); 35 explicit OptionsWindowView(Profile* profile);
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care 216 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care
220 // about this case this will have to be fixed. 217 // about this case this will have to be fixed.
221 if (!instance_) { 218 if (!instance_) {
222 instance_ = new OptionsWindowView(profile); 219 instance_ = new OptionsWindowView(profile);
223 views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_); 220 views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_);
224 // The window is alive by itself now... 221 // The window is alive by itself now...
225 } 222 }
226 instance_->ShowOptionsPage(page, highlight_group); 223 instance_->ShowOptionsPage(page, highlight_group);
227 } 224 }
228 225
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/views/page_info_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698