diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 19:47:28 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 19:47:28 +0000 |
commit | 71675dc7c08391291930adf99d27423ca1ffeb2b (patch) | |
tree | 19abce48d8051e357c15209b2952cd7767380cc3 /chrome/browser/page_info_model.h | |
parent | 9ab634a9baae725ee745436a85fd970dcda784fe (diff) | |
download | chromium_src-71675dc7c08391291930adf99d27423ca1ffeb2b.zip chromium_src-71675dc7c08391291930adf99d27423ca1ffeb2b.tar.gz chromium_src-71675dc7c08391291930adf99d27423ca1ffeb2b.tar.bz2 |
[Mac] Rewrite the page info window to be built dynamically.
Rather than using a XIB, the window is now built entirely in code. The Controller's
unit test has been removed because after this it is functionally useless. A new test
for the bridge has been added.
This also fixes the text clipping bug for the mixed content warning.
BUG=23438,30843
TEST=No functional change; partially covered by unit tests.
Review URL: http://codereview.chromium.org/2066003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_info_model.h')
-rw-r--r-- | chrome/browser/page_info_model.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/chrome/browser/page_info_model.h b/chrome/browser/page_info_model.h index 526372e..a3bee79 100644 --- a/chrome/browser/page_info_model.h +++ b/chrome/browser/page_info_model.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -25,16 +25,6 @@ class PageInfoModel { virtual void ModelChanged() = 0; }; - // Because the UI on the Mac is statically laid-out, this enum provides the - // section type for the associated index. It is only used on Mac. - // Ideally the view wouldn't have to know anything regarding the semantics of - // the model and would only use GetSectionCount()/GetSectionInfo(). - enum SectionType { - IDENTITY = 0, - CONNECTION, - HISTORY - }; - struct SectionInfo { SectionInfo(bool state, const string16& title, @@ -76,7 +66,10 @@ class PageInfoModel { static void RegisterPrefs(PrefService* prefs); - private: + protected: + // Testing constructor. DO NOT USE. + PageInfoModel() {} + PageInfoModelObserver* observer_; std::vector<SectionInfo> sections_; @@ -84,6 +77,7 @@ class PageInfoModel { // Used to request number of visits. CancelableRequestConsumer request_consumer_; + private: DISALLOW_COPY_AND_ASSIGN(PageInfoModel); }; |